diff options
| author | Thomas Adam <thomas@xteddy.org> | 2019-03-07 22:02:42 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2019-03-07 22:02:42 +0000 |
| commit | 349aeb806ab02797e1d28be22802e73f75b77c1d (patch) | |
| tree | 4c0441cbe888d2d8902c19d66da6acef6bf95e39 /server-client.c | |
| parent | a1009e7bd3c4acd7dc4157e317013f066d1deca8 (diff) | |
| parent | f98c66ece81953c777cd332c6bd29d707b1685e5 (diff) | |
| download | rtmux-349aeb806ab02797e1d28be22802e73f75b77c1d.tar.gz rtmux-349aeb806ab02797e1d28be22802e73f75b77c1d.tar.bz2 rtmux-349aeb806ab02797e1d28be22802e73f75b77c1d.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c index e461e249..df44a4a3 100644 --- a/server-client.c +++ b/server-client.c @@ -926,6 +926,7 @@ server_client_handle_key(struct client *c, key_code key) struct window_pane *wp; struct timeval tv; struct key_table *table, *first; + const char *tablename; struct key_binding *bd; int xtimeout, flags; struct cmd_find_state fs; @@ -1007,8 +1008,10 @@ server_client_handle_key(struct client *c, key_code key) if (server_client_is_default_key_table(c, c->keytable) && wp != NULL && wp->mode != NULL && - wp->mode->key_table != NULL) - table = key_bindings_get_table(wp->mode->key_table(wp), 1); + wp->mode->mode->key_table != NULL) { + tablename = wp->mode->mode->key_table(wp->mode); + table = key_bindings_get_table(tablename, 1); + } else table = c->keytable; first = table; |