diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-11-01 23:20:37 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-11-01 23:20:37 +0000 |
| commit | 2f813ef75d7d1cfb32d78923ae6963be7266de55 (patch) | |
| tree | fed2d2ac2f0b98903eea186a19f2444a8ee99452 /cmd-if-shell.c | |
| parent | 32299e401039e9c88e430516e9d85d59d551b859 (diff) | |
| download | rtmux-2f813ef75d7d1cfb32d78923ae6963be7266de55.tar.gz rtmux-2f813ef75d7d1cfb32d78923ae6963be7266de55.tar.bz2 rtmux-2f813ef75d7d1cfb32d78923ae6963be7266de55.zip | |
Add a flag for jobs that shouldn't be freed after they've died and use it for
status jobs, then only kill those jobs when status-left, status-right or
set-titles-string is changed.
Fixes problems with changing options from inside #().
Diffstat (limited to 'cmd-if-shell.c')
| -rw-r--r-- | cmd-if-shell.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index e0775da8..82da814a 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -65,7 +65,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_ctx *ctx) if (ctx->curclient != NULL) ctx->curclient->references++; - job = job_add(NULL, NULL, + job = job_add(NULL, 0, NULL, data->arg, cmd_if_shell_callback, cmd_if_shell_free, cdata); job_run(job); @@ -80,10 +80,8 @@ cmd_if_shell_callback(struct job *job) struct cmd_list *cmdlist; char *cause; - if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0) { - job_free(job); /* calls cmd_if_shell_free */ + if (!WIFEXITED(job->status) || WEXITSTATUS(job->status) != 0) return; - } if (cmd_string_parse(cdata->cmd, &cmdlist, &cause) != 0) { if (cause != NULL) { |