diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-20 16:01:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-20 16:01:11 +0100 |
| commit | af2d48f4d2493d98146490cebd3af150781a0425 (patch) | |
| tree | 3c9e09fe85df8007e17536db66ff13a8edc16a05 /server-client.c | |
| parent | bbdc08780c23187a4984d5abb674fc1fbf66e605 (diff) | |
| parent | 8c8cddbe022af5ece9949804cacffbee6b8972fa (diff) | |
| download | rtmux-af2d48f4d2493d98146490cebd3af150781a0425.tar.gz rtmux-af2d48f4d2493d98146490cebd3af150781a0425.tar.bz2 rtmux-af2d48f4d2493d98146490cebd3af150781a0425.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c index c0918078..389e0123 100644 --- a/server-client.c +++ b/server-client.c @@ -540,7 +540,7 @@ server_client_handle_key(struct client *c, int key) struct window *w; struct window_pane *wp; struct timeval tv; - struct key_table *table = c->keytable; + struct key_table *table; struct key_binding bd_find, *bd; int xtimeout; @@ -606,7 +606,7 @@ server_client_handle_key(struct client *c, int key) retry: /* Try to see if there is a key binding in the current table. */ bd_find.key = key; - bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find); + bd = RB_FIND(key_bindings, &c->keytable->key_bindings, &bd_find); if (bd != NULL) { /* * Key was matched in this table. If currently repeating but a @@ -624,6 +624,7 @@ retry: * Take a reference to this table to make sure the key binding * doesn't disappear. */ + table = c->keytable; table->references++; /* |