From 503edae26fff7a6e6bb8b76f2ea009b2ed99ced1 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Sun, 14 Nov 2010 08:58:25 +0000
Subject: [PATCH] Don't allow last and active window to become the same - a
 very bad move when the active window is closed and freed. Reported by sthen@.

---
 window.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/window.c b/window.c
index 7087e324..a7a5c40e 100644
--- a/window.c
+++ b/window.c
@@ -325,6 +325,8 @@ window_resize(struct window *w, u_int sx, u_int sy)
 void
 window_set_active_pane(struct window *w, struct window_pane *wp)
 {
+	if (wp == w->active)
+		return;
 	w->last = w->active;
 	w->active = wp;
 	while (!window_pane_visible(w->active)) {
@@ -342,7 +344,7 @@ window_set_active_at(struct window *w, u_int x, u_int y)
 	struct window_pane	*wp;
 
 	TAILQ_FOREACH(wp, &w->panes, entry) {
-		if (!window_pane_visible(wp))
+		if (wp == w->active || !window_pane_visible(wp))
 			continue;
 		if (x < wp->xoff || x >= wp->xoff + wp->sx)
 			continue;