diff options
| author | Thomas <thomas@xteddy.org> | 2013-10-11 14:33:29 +0100 |
|---|---|---|
| committer | Thomas <thomas@xteddy.org> | 2013-10-11 14:33:29 +0100 |
| commit | 7f479ffdce8f49f6c57d575b708c4cbe8cbe18df (patch) | |
| tree | c0b1ddfb340c9bd59bbc02e83f30bf34aeb29a88 /cmd-if-shell.c | |
| parent | c190c73240576aa2a8274a305844f1fa7fcb0e71 (diff) | |
| parent | 4901d9ddc8d8c33ecdca363dcb67e66482745fa5 (diff) | |
| download | rtmux-7f479ffdce8f49f6c57d575b708c4cbe8cbe18df.tar.gz rtmux-7f479ffdce8f49f6c57d575b708c4cbe8cbe18df.tar.bz2 rtmux-7f479ffdce8f49f6c57d575b708c4cbe8cbe18df.zip | |
Merge branch 'obsd-master' into mtemp
Diffstat (limited to 'cmd-if-shell.c')
| -rw-r--r-- | cmd-if-shell.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index d1cbd7f3..9b6dcf30 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -41,7 +41,6 @@ const struct cmd_entry cmd_if_shell_entry = { "[-b] " CMD_TARGET_PANE_USAGE " shell-command command [command]", 0, NULL, - NULL, cmd_if_shell_exec }; @@ -148,6 +147,9 @@ cmd_if_shell_done(struct cmd_q *cmdq1) struct cmd_if_shell_data *cdata = cmdq1->data; struct cmd_q *cmdq = cdata->cmdq; + if (cmdq1->client_exit >= 0) + cmdq->client_exit = cmdq1->client_exit; + if (!cmdq_free(cmdq) && !cdata->bflag) cmdq_continue(cmdq); |