diff options
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index 5f744ba1c79..e71b62682ba 100644 --- a/usr.bin/tmux/server-client.c +++ b/usr.bin/tmux/server-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server-client.c,v 1.186 2016/04/30 18:59:02 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.187 2016/06/16 10:55:47 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -184,6 +184,7 @@ server_client_lost(struct client *c) c->flags |= CLIENT_DEAD; + server_clear_identify(c, NULL); status_prompt_clear(c); status_message_clear(c); @@ -606,16 +607,16 @@ server_client_handle_key(struct client *c, key_code key) return; window_unzoom(w); wp = window_pane_at_index(w, key - '0'); - if (wp != NULL && window_pane_visible(wp)) - window_set_active_pane(w, wp); - server_clear_identify(c); + if (wp != NULL && !window_pane_visible(wp)) + wp = NULL; + server_clear_identify(c, wp); return; } /* Handle status line. */ if (!(c->flags & CLIENT_READONLY)) { status_message_clear(c); - server_clear_identify(c); + server_clear_identify(c, NULL); } if (c->prompt_string != NULL) { if (!(c->flags & CLIENT_READONLY)) |