summaryrefslogtreecommitdiffstats
path: root/cmd-run-shell.c
diff options
context:
space:
mode:
authornicm <nicm>2016-11-11 11:37:25 +0000
committernicm <nicm>2016-11-11 11:37:25 +0000
commit36f8fa316d483d19a6399c1b8a18dc4c0fe99081 (patch)
treea2b3d28e7c4c43b1c7630e52904ed459c700fea1 /cmd-run-shell.c
parentf947d25c9dd7d736cf22d4acffb40f41d6e0f726 (diff)
Do not crash with run-shell -b and no window pane available, reported by
Sergei Dyshel.
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;