diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-02-18 22:36:53 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-02-18 22:36:53 +0000 |
| commit | f4196138cefe01df9aed085a7534dc30f45999e8 (patch) | |
| tree | eaa685cd8ce41ba6c3114037bf42d22999ae4f9a /cmd-queue.c | |
| parent | fe1aa9299eb84e89dc5009997b46e0c3bc000e45 (diff) | |
| parent | be6dc83277c49c8f7db30cc363134463af0aa596 (diff) | |
| download | rtmux-f4196138cefe01df9aed085a7534dc30f45999e8.tar.gz rtmux-f4196138cefe01df9aed085a7534dc30f45999e8.tar.bz2 rtmux-f4196138cefe01df9aed085a7534dc30f45999e8.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index 58282c8f..6be532a8 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -163,6 +163,7 @@ cmdq_continue(struct cmd_q *cmdq) int empty, flags; char s[1024]; + cmdq->references++; notify_disable(); empty = TAILQ_EMPTY(&cmdq->queue); @@ -220,11 +221,13 @@ empty: if (cmdq->client_exit > 0) cmdq->client->flags |= CLIENT_EXIT; if (cmdq->emptyfn != NULL) - cmdq->emptyfn(cmdq); /* may free cmdq */ + cmdq->emptyfn(cmdq); empty = 1; out: notify_enable(); + cmdq_free(cmdq); + return (empty); } |