aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-04-24 11:00:32 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-04-24 11:00:32 +0100
commitce52e45d44b38fcedfe27bce519ce6f4fc76a25d (patch)
tree03a44f9facd3deb64ec20b08af7323e803fc7668 /server-client.c
parent4f3c31a6b63f4489bfc672b510036fd8d9491595 (diff)
parent70bc8ef8450bfd2ae90df86f4c02437a4bb83319 (diff)
downloadrtmux-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d.tar.gz
rtmux-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d.tar.bz2
rtmux-ce52e45d44b38fcedfe27bce519ce6f4fc76a25d.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
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);