circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

pull/2497/head
Thomas Adam 2020-11-30 16:01:22 +00:00
parent bf8aa9804b 33046ecee2
commit 70a5207bd1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd-queue.c
View File

@ -768,7 +768,11 @@ cmdq_running(struct client *c)
{ {
struct cmdq_list *queue = cmdq_get(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. */ /* Print a guard line. */

3
tmux.1
View File

@ -2112,7 +2112,8 @@ and
.Ic display-panes-active-colour .Ic display-panes-active-colour
session options. session options.
The indicator is closed when a key is pressed (unless The indicator is closed when a key is pressed (unless
.Fl N is given) or .Fl N
is given) or
.Ar duration .Ar duration
milliseconds have passed. milliseconds have passed.
If If