summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmd-join-pane.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c
index 19186f3b..c6c18583 100644
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -135,11 +135,6 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
window_lost_pane(src_w, src_wp);
TAILQ_REMOVE(&src_w->panes, src_wp, entry);
- if (window_count_panes(src_w) == 0)
- server_kill_window(src_w);
- else
- notify_window_layout_changed(src_w);
-
src_wp->window = dst_w;
TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry);
layout_assign_pane(lc, src_wp);
@@ -156,6 +151,11 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
} else
server_status_session(dst_s);
+ if (window_count_panes(src_w) == 0)
+ server_kill_window(src_w);
+ else
+ notify_window_layout_changed(src_w);
notify_window_layout_changed(dst_w);
+
return (CMD_RETURN_NORMAL);
}