summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/cmd-source-file.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2013-03-25 10:05:58 +0000
committernicm <nicm@openbsd.org>2013-03-25 10:05:58 +0000
commit75da91341797cc1670493edf1440b4a106268c5b (patch)
tree89bd10a1db3721d82440c6ad975342f966b4387f /usr.bin/tmux/cmd-source-file.c
parentPreserve trailing spaces with capture-pane -J, from George Nachman. (diff)
downloadwireguard-openbsd-75da91341797cc1670493edf1440b4a106268c5b.tar.xz
wireguard-openbsd-75da91341797cc1670493edf1440b4a106268c5b.zip
Continue the parent cmdq after sourcing a file.
Diffstat (limited to 'usr.bin/tmux/cmd-source-file.c')
-rw-r--r--usr.bin/tmux/cmd-source-file.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/tmux/cmd-source-file.c b/usr.bin/tmux/cmd-source-file.c
index c4892330abb..033c3247e92 100644
--- a/usr.bin/tmux/cmd-source-file.c
+++ b/usr.bin/tmux/cmd-source-file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-source-file.c,v 1.15 2013/03/24 09:54:10 nicm Exp $ */
+/* $OpenBSD: cmd-source-file.c,v 1.16 2013/03/25 10:05:58 nicm Exp $ */
/*
* Copyright (c) 2008 Tiago Cunha <me@tiagocunha.org>
@@ -98,10 +98,11 @@ cmd_source_file_done(struct cmd_q *cmdq1)
cmdq_free(cmdq1);
cfg_references--;
- if (cmdq_free(cmdq) || cfg_references != 0)
- return;
- cmd_source_file_show(cmdq);
+ if (cmdq_free(cmdq))
+ return;
+ if (cfg_references == 0)
+ cmd_source_file_show(cmdq);
cmdq_continue(cmdq);
}