aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-09-16 10:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2021-09-16 10:01:11 +0100
commit409e121cace098810836e7286a3a55a125424db5 (patch)
treec9b2710018c5e835dadb7751b4325277fe8c609d
parent8554b80b8b9e70b641847a8534af6d5fbc1a39c7 (diff)
parent3c3d371f996b71380547a56db4412c8ca8a31469 (diff)
downloadrtmux-409e121cace098810836e7286a3a55a125424db5.tar.gz
rtmux-409e121cace098810836e7286a3a55a125424db5.tar.bz2
rtmux-409e121cace098810836e7286a3a55a125424db5.zip
Merge branch 'obsd-master' into master
-rw-r--r--cmd-run-shell.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd-run-shell.c b/cmd-run-shell.c
index 537a5e5f..bf43d313 100644
--- a/cmd-run-shell.c
+++ b/cmd-run-shell.c
@@ -181,7 +181,13 @@ cmd_run_shell_timer(__unused int fd, __unused short events, void* arg)
struct cmd_list *cmdlist;
char *error;
- if (cdata->state == NULL && cmd != NULL) {
+ if (cdata->state == NULL) {
+ if (cmd == NULL) {
+ if (cdata->item != NULL)
+ cmdq_continue(cdata->item);
+ cmd_run_shell_free(cdata);
+ return;
+ }
if (job_run(cmd, 0, NULL, cdata->s, cdata->cwd, NULL,
cmd_run_shell_callback, cmd_run_shell_free, cdata,
cdata->flags, -1, -1) == NULL)