diff options
| author |   nicm <nicm@openbsd.org> | 2020-03-31 07:00:34 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-03-31 07:00:34 +0000 |
| commit | af550f8b233fb29f5188bf6d19dd800991fe5d5f (patch) | |
| tree | 136f03fbaa4dd7ccbe95cd5693cb18f6731f454a /usr.bin/tmux/server-client.c | |
| parent | Revert previous, syzkaller found a way to trigger the KASSERT(). (diff) | |
| download | wireguard-openbsd-af550f8b233fb29f5188bf6d19dd800991fe5d5f.tar.xz wireguard-openbsd-af550f8b233fb29f5188bf6d19dd800991fe5d5f.zip | |
Move alternate screen into the screen rather than the pane.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index cf5a0a52791..7811df2b3a8 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.309 2020/03/24 08:09:44 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.310 2020/03/31 07:00:34 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -1400,7 +1400,7 @@ server_client_resize_event(__unused int fd, __unused short events, void *data) log_debug("%s: %%%u timer fired (was%s resized)", __func__, wp->id, (wp->flags & PANE_RESIZED) ? "" : " not"); - if (wp->saved_grid == NULL && (wp->flags & PANE_RESIZED)) { + if (wp->base.saved_grid == NULL && (wp->flags & PANE_RESIZED)) { log_debug("%s: %%%u deferring timer", __func__, wp->id); server_client_start_resize_timer(wp); } else if (!server_client_resize_force(wp)) { |