From 33046ecee2090a7ff733097d1c05d377936b3e5f Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 30 Nov 2020 13:37:45 +0000
Subject: Ignore running command when checking for no-hooks flag if it is
 blocked. GitHub issue 2483.

---
 cmd-queue.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'cmd-queue.c')

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. */
-- 
cgit