Correct the dance to fix the active pane in join-pane by pulling the

(right) code from break-pane and window_remove_pane into a helper
function.

1 files changed, 7 insertions, 1 deletions

diff --git a/window.c b/window.c
index d934dabb..faea6049 100644
--- a/window.c
+++ b/window.c
@@ -591,7 +591,7 @@ window_add_pane(struct window *w, u_int hlimit)
 }
 
 void
-window_remove_pane(struct window *w, struct window_pane *wp)
+window_lost_pane(struct window *w, struct window_pane *wp)
 {
 	if (wp == w->active) {
 		w->active = w->last;
@@ -603,6 +603,12 @@ window_remove_pane(struct window *w, struct window_pane *wp)
 		}
 	} else if (wp == w->last)
 		w->last = NULL;
+}
+
+void
+window_remove_pane(struct window *w, struct window_pane *wp)
+{
+	window_lost_pane(w, wp);
 
 	TAILQ_REMOVE(&w->panes, wp, entry);
 	window_pane_destroy(wp);