From 8b3e2eab5afde62a4eb87b132b4196105c1cfaa6 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Mon, 10 Jul 2023 09:24:53 +0000
Subject: Use a stack for last panes line windows, from Thomas Bertschinger in
 GitHub issue 3588.

---
 cmd-swap-pane.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'cmd-swap-pane.c')

diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 80c20c80..6931bd16 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -128,10 +128,8 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
 			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;
+		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);
 	}
-- 
cgit v1.2.3