aboutsummaryrefslogtreecommitdiff
path: root/cmd-run-shell.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-11-11 12:01:11 +0000
committerThomas Adam <thomas@xteddy.org>2016-11-11 12:01:11 +0000
commitafdef6d122ab667a48b843af74541e9aafcf98e6 (patch)
treec60dccf788c2fb34d50e19aef817e1a2aeac1790 /cmd-run-shell.c
parent13f1a922e180bc8345a32929bbaa74f307569081 (diff)
parent36f8fa316d483d19a6399c1b8a18dc4c0fe99081 (diff)
downloadrtmux-afdef6d122ab667a48b843af74541e9aafcf98e6.tar.gz
rtmux-afdef6d122ab667a48b843af74541e9aafcf98e6.tar.bz2
rtmux-afdef6d122ab667a48b843af74541e9aafcf98e6.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-run-shell.c')
-rw-r--r--cmd-run-shell.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index 1c9d5cbe..08f6120a 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -62,7 +62,7 @@ cmd_run_shell_print(struct job *job, const char *msg)
if (cdata->wp_id != -1)
wp = window_pane_find_by_id(cdata->wp_id);
- if (wp == NULL) {
+ if (cdata->item != NULL && wp == NULL) {
cmdq_print(cdata->item, "%s", msg);
return;
}
@@ -105,11 +105,6 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item)
else
cdata->wp_id = -1;
- if (args_has(args, 't') && wp != NULL)
- cdata->wp_id = wp->id;
- else
- cdata->wp_id = -1;
-
if (!args_has(args, 'b'))
cdata->item = item;