diff options
| author | nicm <nicm> | 2016-08-27 23:35:00 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2016-08-27 23:35:00 +0000 |
| commit | 537964b92dcd2b4a30fdf37a370f9a204fff561c (patch) | |
| tree | 624f39563f26329cf8c98a12183325c132676d59 /cmd-join-pane.c | |
| parent | 6bf033beae757814c8ea63f3394e05ce1c1e4d15 (diff) | |
Kill empty window after moving pane and updating current window, so that
index is still valid before renumber-windows happens. Fixes issue
reported by Eric Pruitt.
Diffstat (limited to 'cmd-join-pane.c')
| -rw-r--r-- | cmd-join-pane.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c index d630dd45..aa8c25f1 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -136,11 +136,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); @@ -157,6 +152,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); } |