===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-switch-client.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/tmux/cmd-switch-client.c	2017/01/28 16:11:27	1.47
--- src/usr.bin/tmux/cmd-switch-client.c	2017/02/06 15:00:41	1.48
***************
*** 1,4 ****
! /* $OpenBSD: cmd-switch-client.c,v 1.47 2017/01/28 16:11:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $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,113 ****
--- 108,115 ----
  	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);