summaryrefslogtreecommitdiffstats
path: root/cmd-source-file.c
diff options
context:
space:
mode:
authornicm <nicm>2013-10-10 12:04:38 +0000
committernicm <nicm>2013-10-10 12:04:38 +0000
commitfc54bfe6b0b5a9053fe967e87f55fbe684abc679 (patch)
tree514d62aa50ecf649259d9d32361dfc1b5ec1b671 /cmd-source-file.c
parent1a49ebaa9f5e5b90ebb27eb5acd0ff5653e34a46 (diff)
Make cmdq->client_exit a tristate (-1 means "not set") so that if
explicitly set it can be copied from child to parent cmdq by if-shell and source-file. This fixes using attach or new. From Chris Johnsen.
Diffstat (limited to 'cmd-source-file.c')
-rw-r--r--cmd-source-file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd-source-file.c b/cmd-source-file.c
index f50efbe3..8fcfe2f3 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -37,7 +37,6 @@ const struct cmd_entry cmd_source_file_entry = {
"path",
0,
NULL,
- NULL,
cmd_source_file_exec
};
@@ -96,6 +95,9 @@ cmd_source_file_done(struct cmd_q *cmdq1)
{
struct cmd_q *cmdq = cmdq1->data;
+ if (cmdq1->client_exit >= 0)
+ cmdq->client_exit = cmdq1->client_exit;
+
cmdq_free(cmdq1);
cfg_references--;