From 583c885d68bc567789451db25e49a3fac36f194c Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Sun, 8 May 2011 21:12:52 +0000
Subject: [PATCH] Reset last pane on swap-pane across windows, fixes crash
 noticed by hsim at gmx.li.

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

diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 8e0662dd..aa133faf 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -129,6 +129,12 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 		if (dst_w->active == dst_wp)
 			window_set_active_pane(dst_w, src_wp);
 	}
+	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;
+	}
 	server_redraw_window(src_w);
 	server_redraw_window(dst_w);