summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/cmd-switch-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2017-02-06 15:00:42 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2017-02-06 15:00:42 +0000
commitbe7b276a62c4d5003055539797020173cb99eefe (patch)
tree3e3649b21bc293f08bec6e111b5d166999a80989 /usr.bin/tmux/cmd-switch-client.c
parent80b260b1b7896915d35330b223b21d9f20c212c2 (diff)
Cancel key table when switching session, unless the key is going to
repeat. Reported by Amos Bird.
Diffstat (limited to 'usr.bin/tmux/cmd-switch-client.c')
-rw-r--r--usr.bin/tmux/cmd-switch-client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/tmux/cmd-switch-client.c b/usr.bin/tmux/cmd-switch-client.c
index d95feeb8086..775b545b2d1 100644
--- a/usr.bin/tmux/cmd-switch-client.c
+++ b/usr.bin/tmux/cmd-switch-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-switch-client.c,v 1.47 2017/01/28 16:11:27 nicm Exp $ */
+/* $OpenBSD: cmd-switch-client.c,v 1.48 2017/02/06 15:00:41 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -108,6 +108,8 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
if (c->session != NULL && c->session != s)
c->last_session = c->session;
c->session = s;
+ if (!item->repeat)
+ server_client_set_key_table(c, NULL);
status_timer_start(c);
session_update_activity(s, NULL);
gettimeofday(&s->last_attached_time, NULL);