diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-03-12 12:02:42 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-03-12 12:02:42 +0000 |
| commit | 3ec05e940505f1d0b4e55413f949fdfaceddedde (patch) | |
| tree | 843d754e76bb7386f39cb5743ab8de859e880ddd /cmd-queue.c | |
| parent | f8a30e158821876e8c30d46ab2728bce739e35de (diff) | |
| parent | 3f6bfbaf2babcc7f08f628a82ff31b0b52014e58 (diff) | |
| download | rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.tar.gz rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.tar.bz2 rtmux-3ec05e940505f1d0b4e55413f949fdfaceddedde.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index 2a95a3e5..97b3c1c9 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -404,10 +404,11 @@ cmdq_guard(struct cmdq_item *item, const char *guard, int flags) void cmdq_print(struct cmdq_item *item, const char *fmt, ...) { - struct client *c = item->client; - struct window_pane *wp; - va_list ap; - char *tmp, *msg; + struct client *c = item->client; + struct window_pane *wp; + struct window_mode_entry *wme; + va_list ap; + char *tmp, *msg; va_start(ap, fmt); @@ -426,10 +427,9 @@ cmdq_print(struct cmdq_item *item, const char *fmt, ...) server_client_push_stdout(c); } else { wp = c->session->curw->window->active; - if (wp->mode == NULL || wp->mode->mode != &window_view_mode) { - window_pane_reset_mode(wp); + wme = TAILQ_FIRST(&wp->modes); + if (wme == NULL || wme->mode != &window_view_mode) window_pane_set_mode(wp, &window_view_mode, NULL, NULL); - } window_copy_vadd(wp, fmt, ap); } |