diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2016-11-11 11:37:26 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2016-11-11 11:37:26 +0000 |
| commit | a4f3ebdefe36c08062111d6ccdeb69d05dfd2507 (patch) | |
| tree | 35fc3aa2e6813ee2007104fbda4f300ad4c6cf32 /usr.bin | |
| parent | 292d7369548ef09f6ef3d7a5b4689909fc9b154c (diff) | |
Do not crash with run-shell -b and no window pane available, reported by
Sergei Dyshel.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/cmd-run-shell.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/tmux/cmd-run-shell.c b/usr.bin/tmux/cmd-run-shell.c index b32ce777888..d83f5620b92 100644 --- a/usr.bin/tmux/cmd-run-shell.c +++ b/usr.bin/tmux/cmd-run-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-run-shell.c,v 1.41 2016/10/16 19:04:05 nicm Exp $ */ +/* $OpenBSD: cmd-run-shell.c,v 1.42 2016/11/11 11:37:25 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -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; |