Fix crash exiting command prompt (from Alex Maese in GitHub issue 1139)

and a man page tweak from jmc.
This commit is contained in:
nicm 2017-10-26 08:17:12 +00:00
parent be4c01697c
commit e91e8a2a6c
2 changed files with 1 additions and 2 deletions

1
tmux.1
View File

@ -3352,7 +3352,6 @@ All the notifications listed in the
section are hooks (without any arguments), except section are hooks (without any arguments), except
.Ic %exit . .Ic %exit .
The following additional hooks are available: The following additional hooks are available:
.Pp
.Bl -tag -width "XXXXXXXXXXXXXXXXXXXXXX" .Bl -tag -width "XXXXXXXXXXXXXXXXXXXXXX"
.It alert-activity .It alert-activity
Run when a window has activity. Run when a window has activity.

View File

@ -931,7 +931,7 @@ window_tree_command_callback(struct client *c, void *modedata, const char *s,
{ {
struct window_tree_modedata *data = modedata; struct window_tree_modedata *data = modedata;
if (data->dead) if (s == NULL || data->dead)
return (0); return (0);
data->entered = s; data->entered = s;