diff options
| author |   nicm <nicm@openbsd.org> | 2014-06-05 22:14:29 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2014-06-05 22:14:29 +0000 |
| commit | b76d267f6a744119b57d3f9656cc79e8afbfa837 (patch) | |
| tree | 6a3a1c60f54d52d1ac72240dc879ae491d63a312 | |
| parent | Remove conditional pipeline rewind on 88100, introduced in 1.19 - this seems (diff) | |
| download | wireguard-openbsd-b76d267f6a744119b57d3f9656cc79e8afbfa837.tar.xz wireguard-openbsd-b76d267f6a744119b57d3f9656cc79e8afbfa837.zip | |
Reset properly when c0-change-trigger is increased from zero so panes
don't get stuck.
| -rw-r--r-- | usr.bin/tmux/input.c | 4 | ||||
| -rw-r--r-- | usr.bin/tmux/window.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/tmux/input.c b/usr.bin/tmux/input.c index 389b5f3b5d2..cfda9d3dbb0 100644 --- a/usr.bin/tmux/input.c +++ b/usr.bin/tmux/input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: input.c,v 1.67 2014/04/17 12:43:38 nicm Exp $ */ +/* $OpenBSD: input.c,v 1.68 2014/06/05 22:14:29 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1014,7 +1014,7 @@ input_c0_dispatch(struct input_ctx *ictx) count_c0: trigger = options_get_number(&wp->window->options, "c0-change-trigger"); - if (++wp->changes == trigger) { + if (trigger != 0 && ++wp->changes >= trigger) { wp->flags |= PANE_DROP; window_pane_timer_start(wp); } diff --git a/usr.bin/tmux/window.c b/usr.bin/tmux/window.c index fbd09743041..3e63e327622 100644 --- a/usr.bin/tmux/window.c +++ b/usr.bin/tmux/window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.110 2014/05/13 08:08:32 nicm Exp $ */ +/* $OpenBSD: window.c,v 1.111 2014/06/05 22:14:29 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -877,7 +877,6 @@ window_pane_timer_callback(unused int fd, unused short events, void *data) if (wp->changes_redraw++ == interval) { wp->flags |= PANE_REDRAW; wp->changes_redraw = 0; - } if (trigger == 0 || wp->changes < trigger) { |