diff options
| author | nicm <nicm> | 2014-04-17 09:13:13 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2014-04-17 09:13:13 +0000 |
| commit | 2e98c9057de6c5700ca01bd58932373b103ef976 (patch) | |
| tree | 49a1f04bf4e1e47c597ef7e1d053a4fc24db0595 /cmd-join-pane.c | |
| parent | 2740490e279bac7b01f18cc39aa59a5de09e3a95 (diff) | |
| download | rtmux-2e98c9057de6c5700ca01bd58932373b103ef976.tar.gz rtmux-2e98c9057de6c5700ca01bd58932373b103ef976.tar.bz2 rtmux-2e98c9057de6c5700ca01bd58932373b103ef976.zip | |
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.
Diffstat (limited to 'cmd-join-pane.c')
| -rw-r--r-- | cmd-join-pane.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c index b70f93dc..7d7b1eea 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -139,11 +139,7 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window) layout_close_pane(src_wp); - if (src_w->active == src_wp) { - src_w->active = TAILQ_PREV(src_wp, window_panes, entry); - if (src_w->active == NULL) - src_w->active = TAILQ_NEXT(src_wp, entry); - } + window_lost_pane(src_w, src_wp); TAILQ_REMOVE(&src_w->panes, src_wp, entry); if (window_count_panes(src_w) == 0) |