aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-04-21 16:01:18 +0100
committerThomas Adam <thomas@xteddy.org>2017-04-21 16:01:18 +0100
commit4612419c143c3f748bc5f6ccd467c7c0014e8d48 (patch)
tree42929aeeb8b1d89abf639124412199fac7092f04 /server-client.c
parent93062ad09952f411d48818b05dc9898bc14dcfde (diff)
parentc799425069d02675474cda312fac1457829052fb (diff)
downloadrtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.tar.gz
rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.tar.bz2
rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/server-client.c b/server-client.c
index 3cabde71..0a4282d7 100644
--- a/server-client.c
+++ b/server-client.c
@@ -906,7 +906,8 @@ retry:
* non-repeating binding was found, stop repeating and try
* again in the root table.
*/
- if ((c->flags & CLIENT_REPEAT) && !bd->can_repeat) {
+ if ((c->flags & CLIENT_REPEAT) &&
+ (~bd->flags & KEY_BINDING_REPEAT)) {
server_client_set_key_table(c, NULL);
c->flags &= ~CLIENT_REPEAT;
server_status_client(c);
@@ -924,7 +925,7 @@ retry:
* the client back to the root table.
*/
xtimeout = options_get_number(s->options, "repeat-time");
- if (xtimeout != 0 && bd->can_repeat) {
+ if (xtimeout != 0 && (bd->flags & KEY_BINDING_REPEAT)) {
c->flags |= CLIENT_REPEAT;
tv.tv_sec = xtimeout / 1000;