diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-06-16 14:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-06-16 14:01:11 +0100 |
| commit | 93f42d360b8dbeff738992c15067d608ead16c21 (patch) | |
| tree | 4f9cc77ac128f028a343bcc73651a8f12c61d099 /server-client.c | |
| parent | d35a9ac5f20f65eecd1822e9a4ace2033756656a (diff) | |
| parent | 325cbe90d925d3deb90559463b6d968c31fa5924 (diff) | |
| download | rtmux-93f42d360b8dbeff738992c15067d608ead16c21.tar.gz rtmux-93f42d360b8dbeff738992c15067d608ead16c21.tar.bz2 rtmux-93f42d360b8dbeff738992c15067d608ead16c21.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c index 531d710c..f61cfa38 100644 --- a/server-client.c +++ b/server-client.c @@ -182,6 +182,7 @@ server_client_lost(struct client *c) c->flags |= CLIENT_DEAD; + server_clear_identify(c, NULL); status_prompt_clear(c); status_message_clear(c); @@ -604,16 +605,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)) |