===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/session.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -c -r1.91 -r1.92
*** src/usr.bin/tmux/session.c	2022/02/22 11:10:41	1.91
--- src/usr.bin/tmux/session.c	2022/02/22 13:31:18	1.92
***************
*** 1,4 ****
! /* $OpenBSD: session.c,v 1.91 2022/02/22 11:10:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: session.c,v 1.92 2022/02/22 13:31:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 503,509 ****
  	winlink_stack_push(&s->lastw, s->curw);
  	s->curw = wl;
  	if (options_get_number(global_options, "focus-events")) {
! 		window_update_focus(old->window);
  		window_update_focus(wl->window);
  	}
  	winlink_clear_flags(wl);
--- 503,510 ----
  	winlink_stack_push(&s->lastw, s->curw);
  	s->curw = wl;
  	if (options_get_number(global_options, "focus-events")) {
! 		if (old != NULL)
! 			window_update_focus(old->window);
  		window_update_focus(wl->window);
  	}
  	winlink_clear_flags(wl);