diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-10-01 23:50:24 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-10-01 23:50:24 +0100 |
| commit | 13360ad54157790cbbaab757f659cb6d8a4ce2c4 (patch) | |
| tree | 848e4df56152b0cd46fd3c855b95394bf4b815a4 /cmd-if-shell.c | |
| parent | 9389cfbec9d7f4a7b5f9d4a580428949db4f6e67 (diff) | |
| parent | 7be152412ea0a614df11bce9ba5097574369a5f6 (diff) | |
| download | rtmux-13360ad54157790cbbaab757f659cb6d8a4ce2c4.tar.gz rtmux-13360ad54157790cbbaab757f659cb6d8a4ce2c4.tar.bz2 rtmux-13360ad54157790cbbaab757f659cb6d8a4ce2c4.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-if-shell.c')
| -rw-r--r-- | cmd-if-shell.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index a074341b..9b6dcf30 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -147,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); |