From e63e2df764a59476a28fd6d11da8dd7d680ea602 Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 7 Oct 2026 12:02:21 +0000 Subject: [PATCH] Do not change active pane if joining a pane to the same window. Reported by David le Blanc. --- cmd-join-pane.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd-join-pane.c b/cmd-join-pane.c index 28002bcd1..4bc03b5d2 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-join-pane.c,v 1.76 2026/10/02 12:48:52 nicm Exp $ */ +/* $OpenBSD: cmd-join-pane.c,v 1.77 2026/10/07 12:02:21 nicm Exp $ */ /* * Copyright (c) 2011 George Nachman @@ -504,7 +504,8 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) layout_close_pane(src_wp); server_client_remove_pane(src_wp); - window_lost_pane(src_w, src_wp); + if (src_w != dst_w) + window_lost_pane(src_w, src_wp); TAILQ_REMOVE(&src_w->panes, src_wp, entry); TAILQ_REMOVE(&src_w->z_index, src_wp, zentry);