aboutsummaryrefslogtreecommitdiff
path: root/cmd-switch-client.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-12-12 20:01:15 +0000
committerThomas Adam <thomas@xteddy.org>2015-12-12 20:01:15 +0000
commit845a664bb2d06ac1cdc0af37d753d107f4353955 (patch)
treebdd2832180ef678265972308ed08e71ab0bbab60 /cmd-switch-client.c
parent5a5db02b8514eff40b97b3f3e4e85a3d948b57da (diff)
parent5ed17e84faed0a7655ec1eb3de291b60839dcb12 (diff)
downloadrtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.tar.gz
rtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.tar.bz2
rtmux-845a664bb2d06ac1cdc0af37d753d107f4353955.zip
Merge branch 'obsd-master'
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 edc0fd69..4746b15a 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -65,6 +65,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
table->references++;
key_bindings_unref_table(c->keytable);
c->keytable = table;
+ return (CMD_RETURN_NORMAL);
}
tflag = args_get(args, 't');
@@ -123,6 +124,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmd_q *cmdq)
if (c->session != NULL && c->session != s)
c->last_session = c->session;
c->session = s;
+ server_client_set_key_table(c, NULL);
status_timer_start(c);
session_update_activity(s, NULL);
gettimeofday(&s->last_attached_time, NULL);