diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-11-30 16:01:22 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-11-30 16:01:22 +0000 |
| commit | 70a5207bd10fb0896ff9f2adbbba0d9eac962155 (patch) | |
| tree | 713259d8dc5cc25d63fcc8145e6494cf171a0874 | |
| parent | bf8aa9804b044db13a54a48a9e03719adb32447e (diff) | |
| parent | 33046ecee2090a7ff733097d1c05d377936b3e5f (diff) | |
| download | rtmux-70a5207bd10fb0896ff9f2adbbba0d9eac962155.tar.gz rtmux-70a5207bd10fb0896ff9f2adbbba0d9eac962155.tar.bz2 rtmux-70a5207bd10fb0896ff9f2adbbba0d9eac962155.zip | |
Merge branch 'obsd-master' into master
| -rw-r--r-- | cmd-queue.c | 6 | ||||
| -rw-r--r-- | tmux.1 | 3 |
2 files changed, 7 insertions, 2 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. */ @@ -2112,7 +2112,8 @@ and .Ic display-panes-active-colour session options. The indicator is closed when a key is pressed (unless -.Fl N is given) or +.Fl N +is given) or .Ar duration milliseconds have passed. If |