diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-14 22:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-14 22:01:11 +0100 |
| commit | 9d58febc8f4243ed4a392e45f89de0455c032090 (patch) | |
| tree | af3d1d33835ae7b6a6b7b9830df0527044bfd1b9 /cmd-source-file.c | |
| parent | 33fbf82ac0623c53603462e17e0a2eda489867e4 (diff) | |
| parent | 1721d1994eb03beb8217fa3e61ed0cc097dd899e (diff) | |
| download | rtmux-9d58febc8f4243ed4a392e45f89de0455c032090.tar.gz rtmux-9d58febc8f4243ed4a392e45f89de0455c032090.tar.bz2 rtmux-9d58febc8f4243ed4a392e45f89de0455c032090.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-source-file.c')
| -rw-r--r-- | cmd-source-file.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd-source-file.c b/cmd-source-file.c index 0f299ddf..336a79e6 100644 --- a/cmd-source-file.c +++ b/cmd-source-file.c @@ -68,6 +68,8 @@ cmd_source_file_exec(struct cmd *self, struct cmd_q *cmdq) return (CMD_RETURN_NORMAL); } + log_debug("%s: cmdq %p, parent %p", __func__, cmdq1, cmdq); + cmdq->references++; cfg_references++; @@ -80,16 +82,15 @@ cmd_source_file_done(struct cmd_q *cmdq1) { struct cmd_q *cmdq = cmdq1->data; + log_debug("%s: cmdq %p, parent %p", __func__, cmdq1, cmdq); + if (cmdq1->client_exit >= 0) cmdq->client_exit = cmdq1->client_exit; - cmdq_free(cmdq1); cfg_references--; - if (cmdq_free(cmdq)) return; - if (cfg_references == 0) cfg_print_causes(cmdq); cmdq_continue(cmdq); |