===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-switch-client.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -c -r1.58 -r1.59
*** src/usr.bin/tmux/cmd-switch-client.c	2019/08/14 09:58:31	1.58
--- src/usr.bin/tmux/cmd-switch-client.c	2020/03/06 15:35:03	1.59
***************
*** 1,4 ****
! /* $OpenBSD: cmd-switch-client.c,v 1.58 2019/08/14 09:58:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-switch-client.c,v 1.59 2020/03/06 15:35:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 142,151 ****
  	session_update_activity(s, NULL);
  	gettimeofday(&s->last_attached_time, NULL);
  
- 	recalculate_sizes();
  	server_check_unattached();
  	server_redraw_client(c);
  	s->curw->flags &= ~WINLINK_ALERTFLAGS;
  	alerts_check_session(s);
  
  	return (CMD_RETURN_NORMAL);
--- 142,152 ----
  	session_update_activity(s, NULL);
  	gettimeofday(&s->last_attached_time, NULL);
  
  	server_check_unattached();
  	server_redraw_client(c);
  	s->curw->flags &= ~WINLINK_ALERTFLAGS;
+ 	s->curw->window->latest = c;
+ 	recalculate_sizes();
  	alerts_check_session(s);
  
  	return (CMD_RETURN_NORMAL);