aboutsummaryrefslogtreecommitdiff
path: root/cmd-switch-client.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-02-07 13:41:17 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-02-07 13:41:17 +0000
commit8872a0da8e9588b0ec5eac1a1cc3753037ed68e1 (patch)
tree5c21a56f80ffeed5c2c1edadb7b1b73873026a3a /cmd-switch-client.c
parent0f5a2c86da5cf2cf024b0653fb84f2dc69c246a2 (diff)
parent9f66fb4fd779640c214df812afcdc0840d851c53 (diff)
downloadrtmux-8872a0da8e9588b0ec5eac1a1cc3753037ed68e1.tar.gz
rtmux-8872a0da8e9588b0ec5eac1a1cc3753037ed68e1.tar.bz2
rtmux-8872a0da8e9588b0ec5eac1a1cc3753037ed68e1.zip
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'cmd-switch-client.c')
-rw-r--r--cmd-switch-client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index 5cf4756f..5bcdbb78 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -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);