From bde0224deb0d0ba87929d2abfb262f3bd187b889 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 18 Dec 2018 13:20:44 +0000
Subject: Pass window into mode functions.

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

(limited to 'server-client.c')

diff --git a/server-client.c b/server-client.c
index 94cc9e92..0e105d7c 100644
--- a/server-client.c
+++ b/server-client.c
@@ -923,6 +923,7 @@ server_client_handle_key(struct client *c, key_code key)
 {
 	struct mouse_event	*m = &c->tty.mouse;
 	struct session		*s = c->session;
+	struct winlink		*wl;
 	struct window		*w;
 	struct window_pane	*wp;
 	struct timeval		 tv;
@@ -935,7 +936,8 @@ server_client_handle_key(struct client *c, key_code key)
 	/* Check the client is good to accept input. */
 	if (s == NULL || (c->flags & (CLIENT_DEAD|CLIENT_SUSPENDED)) != 0)
 		return;
-	w = s->curw->window;
+	wl = s->curw;
+	w = wl->window;
 
 	/* Update the activity timer. */
 	if (gettimeofday(&c->activity_time, NULL) != 0)
@@ -1126,7 +1128,7 @@ forward_key:
 	if (c->flags & CLIENT_READONLY)
 		return;
 	if (wp != NULL)
-		window_pane_key(wp, c, s, key, m);
+		window_pane_key(wp, c, s, wl, key, m);
 }
 
 /* Client functions that need to happen every loop. */
-- 
cgit