summaryrefslogtreecommitdiffstats
path: root/cmd-queue.c
diff options
context:
space:
mode:
authornicm <nicm>2020-11-30 13:37:45 +0000
committernicm <nicm>2020-11-30 13:37:45 +0000
commit33046ecee2090a7ff733097d1c05d377936b3e5f (patch)
treea5b3fc2e4fe4d0f8f9a3bdf5c8d36e775187bbe5 /cmd-queue.c
parentfd5c3e6122faea45d3eb44275424d78bc67b0ce2 (diff)
Ignore running command when checking for no-hooks flag if it is blocked.
GitHub issue 2483.
Diffstat (limited to 'cmd-queue.c')
-rw-r--r--cmd-queue.c6
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. */