===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-select-pane.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** src/usr.bin/tmux/cmd-select-pane.c	2020/05/26 08:47:50	1.62
--- src/usr.bin/tmux/cmd-select-pane.c	2020/07/03 07:00:12	1.63
***************
*** 1,4 ****
! /* $OpenBSD: cmd-select-pane.c,v 1.62 2020/05/26 08:47:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-select-pane.c,v 1.63 2020/07/03 07:00:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 205,211 ****
  		return (CMD_RETURN_NORMAL);
  	}
  
! 	if (c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
  		activewp = server_client_get_pane(c);
  	else
  		activewp = w->active;
--- 205,211 ----
  		return (CMD_RETURN_NORMAL);
  	}
  
! 	if (c != NULL && c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
  		activewp = server_client_get_pane(c);
  	else
  		activewp = w->active;
***************
*** 214,220 ****
  	if (window_push_zoom(w, args_has(args, 'Z')))
  		server_redraw_window(w);
  	window_redraw_active_switch(w, wp);
! 	if (c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
  		server_client_set_pane(c, wp);
  	else if (window_set_active_pane(w, wp, 1))
  		cmd_find_from_winlink_pane(current, wl, wp, 0);
--- 214,220 ----
  	if (window_push_zoom(w, args_has(args, 'Z')))
  		server_redraw_window(w);
  	window_redraw_active_switch(w, wp);
! 	if (c != NULL && c->session != NULL && (c->flags & CLIENT_ACTIVEPANE))
  		server_client_set_pane(c, wp);
  	else if (window_set_active_pane(w, wp, 1))
  		cmd_find_from_winlink_pane(current, wl, wp, 0);