Merge branch 'obsd-master'

Sync from OpenBSD.
This commit is contained in:
Thomas Adam
2013-04-23 08:26:04 +01:00
8 changed files with 31 additions and 18 deletions

View File

@ -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);