aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-05-15 16:50:15 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-05-15 16:50:15 +0100
commit907ad00300506c25ee84223811e25a411dc21517 (patch)
treeec84d431722e22820564b77157df41c11ccc25be /server-client.c
parent5b1cf02f2ea224922661495af32d46b024e28eef (diff)
parentfce095665c62eb38826f42ae55a0fbe998f18be0 (diff)
downloadrtmux-907ad00300506c25ee84223811e25a411dc21517.tar.gz
rtmux-907ad00300506c25ee84223811e25a411dc21517.tar.bz2
rtmux-907ad00300506c25ee84223811e25a411dc21517.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts: Makefile.am
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/server-client.c b/server-client.c
index 84633296..1c15a555 100644
--- a/server-client.c
+++ b/server-client.c
@@ -514,8 +514,10 @@ server_client_loop(void)
w->flags &= ~WINDOW_REDRAW;
TAILQ_FOREACH(wp, &w->panes, entry) {
- server_client_check_focus(wp);
- server_client_check_resize(wp);
+ if (wp->fd != -1) {
+ server_client_check_focus(wp);
+ server_client_check_resize(wp);
+ }
wp->flags &= ~PANE_REDRAW;
}
}
@@ -527,7 +529,7 @@ server_client_check_resize(struct window_pane *wp)
{
struct winsize ws;
- if (wp->fd == -1 || !(wp->flags & PANE_RESIZE))
+ if (!(wp->flags & PANE_RESIZE))
return;
memset(&ws, 0, sizeof ws);