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-run-shell.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-run-shell.c')
| -rw-r--r-- | cmd-run-shell.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-run-shell.c b/cmd-run-shell.c index 8e99f90b..c9a478c7 100644 --- a/cmd-run-shell.c +++ b/cmd-run-shell.c @@ -60,6 +60,7 @@ cmd_run_shell_print(struct job *job, const char *msg) struct cmd_run_shell_data *cdata = job_get_data(job); struct window_pane *wp = NULL; struct cmd_find_state fs; + struct window_mode_entry *wme; if (cdata->wp_id != -1) wp = window_pane_find_by_id(cdata->wp_id); @@ -75,10 +76,9 @@ cmd_run_shell_print(struct job *job, const char *msg) return; } - 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_add(wp, "%s", msg); } |