aboutsummaryrefslogtreecommitdiff
path: root/cmd-queue.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-11-30 16:01:22 +0000
committerThomas Adam <thomas@xteddy.org>2020-11-30 16:01:22 +0000
commit70a5207bd10fb0896ff9f2adbbba0d9eac962155 (patch)
tree713259d8dc5cc25d63fcc8145e6494cf171a0874 /cmd-queue.c
parentbf8aa9804b044db13a54a48a9e03719adb32447e (diff)
parent33046ecee2090a7ff733097d1c05d377936b3e5f (diff)
downloadrtmux-70a5207bd10fb0896ff9f2adbbba0d9eac962155.tar.gz
rtmux-70a5207bd10fb0896ff9f2adbbba0d9eac962155.tar.bz2
rtmux-70a5207bd10fb0896ff9f2adbbba0d9eac962155.zip
Merge branch 'obsd-master' into master
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. */