diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
| commit | c01251d02388efceca515c47c257e2b5342e3716 (patch) | |
| tree | ca89407cb43bd2caa40a6854ba49ce1720e892ce /cmd-queue.c | |
| parent | 5c275c2a1a963876d4ac392067e42120417dbf43 (diff) | |
| parent | 1466b570eedda0423d5a386d2b16b7ff0c0e477c (diff) | |
| download | rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.gz rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.bz2 rtmux-c01251d02388efceca515c47c257e2b5342e3716.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'cmd-queue.c')
| -rw-r--r-- | cmd-queue.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index 36f1c9be..05f439f5 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -768,7 +768,11 @@ cmdq_running(struct client *c) { struct cmdq_list *queue = cmdq_get(c); - return (queue->item); + if (queue->item == NULL) + return (NULL); + if (queue->item->flags & CMDQ_WAITING) + return (NULL); + return (queue->item); } /* Print a guard line. */ |