===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-swap-pane.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/tmux/cmd-swap-pane.c	2023/01/17 06:50:55	1.42
--- src/usr.bin/tmux/cmd-swap-pane.c	2023/07/10 09:24:53	1.43
***************
*** 1,4 ****
! /* $OpenBSD: cmd-swap-pane.c,v 1.42 2023/01/17 06:50:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-swap-pane.c,v 1.43 2023/07/10 09:24:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 128,137 ****
  			window_set_active_pane(dst_w, src_wp, 1);
  	}
  	if (src_w != dst_w) {
! 		if (src_w->last == src_wp)
! 			src_w->last = NULL;
! 		if (dst_w->last == dst_wp)
! 			dst_w->last = NULL;
  		colour_palette_from_option(&src_wp->palette, src_wp->options);
  		colour_palette_from_option(&dst_wp->palette, dst_wp->options);
  	}
--- 128,135 ----
  			window_set_active_pane(dst_w, src_wp, 1);
  	}
  	if (src_w != dst_w) {
! 		window_pane_stack_remove(&src_w->last_panes, src_wp);
! 		window_pane_stack_remove(&dst_w->last_panes, dst_wp);
  		colour_palette_from_option(&src_wp->palette, src_wp->options);
  		colour_palette_from_option(&dst_wp->palette, dst_wp->options);
  	}