From db2412e2ace3fbb9f0587672ae8bd1e57ba4efd1 Mon Sep 17 00:00:00 2001 From: nicm Date: Sat, 12 Nov 2016 19:05:53 +0000 Subject: Apply the right fix for run -b, used the wrong diff before. --- cmd-run-shell.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'cmd-run-shell.c') diff --git a/cmd-run-shell.c b/cmd-run-shell.c index 08f6120a..e5726b26 100644 --- a/cmd-run-shell.c +++ b/cmd-run-shell.c @@ -59,12 +59,20 @@ cmd_run_shell_print(struct job *job, const char *msg) { struct cmd_run_shell_data *cdata = job->data; struct window_pane *wp = NULL; + struct cmd_find_state fs; if (cdata->wp_id != -1) wp = window_pane_find_by_id(cdata->wp_id); - if (cdata->item != NULL && wp == NULL) { - cmdq_print(cdata->item, "%s", msg); - return; + if (wp == NULL) { + if (cdata->item != NULL) { + cmdq_print(cdata->item, "%s", msg); + return; + } + if (cmd_find_current (&fs, NULL, CMD_FIND_QUIET) != 0) + return; + wp = fs.wp; + if (wp == NULL) + return; } if (window_pane_set_mode(wp, &window_copy_mode) == 0) -- cgit v1.2.3