From 325cbe90d925d3deb90559463b6d968c31fa5924 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 16 Jun 2016 10:55:47 +0000
Subject: Allow a command to be specified to display-panes, similar to
 command-prompt, rather than always just selecting the pane.

---
 server-client.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'server-client.c')

diff --git a/server-client.c b/server-client.c
index 11995f40..0c0b2cff 100644
--- a/server-client.c
+++ b/server-client.c
@@ -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))
-- 
cgit