aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornicm <nicm>2017-10-26 08:17:12 +0000
committernicm <nicm>2017-10-26 08:17:12 +0000
commite91e8a2a6c9bd36309acc58723cb62edc4410931 (patch)
tree22d3c1a3930d23ed0a7d74e2d6a4cf38b6a38efd
parentbe4c01697cec057e8043eb6b81ef959271581eb3 (diff)
downloadrtmux-e91e8a2a6c9bd36309acc58723cb62edc4410931.tar.gz
rtmux-e91e8a2a6c9bd36309acc58723cb62edc4410931.tar.bz2
rtmux-e91e8a2a6c9bd36309acc58723cb62edc4410931.zip
Fix crash exiting command prompt (from Alex Maese in GitHub issue 1139)
and a man page tweak from jmc.
-rw-r--r--tmux.11
-rw-r--r--window-tree.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/tmux.1 b/tmux.1
index b2171b4c..847e3e1b 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3352,7 +3352,6 @@ All the notifications listed in the
section are hooks (without any arguments), except
.Ic %exit .
The following additional hooks are available:
-.Pp
.Bl -tag -width "XXXXXXXXXXXXXXXXXXXXXX"
.It alert-activity
Run when a window has activity.
diff --git a/window-tree.c b/window-tree.c
index b7626c86..164f0aad 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -931,7 +931,7 @@ window_tree_command_callback(struct client *c, void *modedata, const char *s,
{
struct window_tree_modedata *data = modedata;
- if (data->dead)
+ if (s == NULL || data->dead)
return (0);
data->entered = s;