aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2018-12-18 14:02:40 +0000
committerThomas Adam <thomas@xteddy.org>2018-12-18 14:02:40 +0000
commitc9d482ab489d5d57d481858091608ee1b32e46ab (patch)
tree6c4098d661b689f9fda7e75a4a2c6e771e7e8a6f /server-client.c
parentb6cdac05c7f9ab04bc304a093fe81bee7c2e40c0 (diff)
parentbde0224deb0d0ba87929d2abfb262f3bd187b889 (diff)
downloadrtmux-c9d482ab489d5d57d481858091608ee1b32e46ab.tar.gz
rtmux-c9d482ab489d5d57d481858091608ee1b32e46ab.tar.bz2
rtmux-c9d482ab489d5d57d481858091608ee1b32e46ab.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c
index 41e4a1a5..dd1e8b81 100644
--- a/server-client.c
+++ b/server-client.c
@@ -921,6 +921,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;
@@ -933,7 +934,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)
@@ -1124,7 +1126,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. */