diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-02 12:08:34 +0000 |
| commit | c01251d02388efceca515c47c257e2b5342e3716 (patch) | |
| tree | ca89407cb43bd2caa40a6854ba49ce1720e892ce /cmd-join-pane.c | |
| parent | 5c275c2a1a963876d4ac392067e42120417dbf43 (diff) | |
| parent | 1466b570eedda0423d5a386d2b16b7ff0c0e477c (diff) | |
| download | rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.gz rtmux-c01251d02388efceca515c47c257e2b5342e3716.tar.bz2 rtmux-c01251d02388efceca515c47c257e2b5342e3716.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'cmd-join-pane.c')
| -rw-r--r-- | cmd-join-pane.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c index 306cf4bc..36805c46 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -142,7 +142,10 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) src_wp->window = dst_w; options_set_parent(src_wp->options, dst_w->options); src_wp->flags |= PANE_STYLECHANGED; - TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry); + if (flags & SPAWN_BEFORE) + TAILQ_INSERT_BEFORE(dst_wp, src_wp, entry); + else + TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry); layout_assign_pane(lc, src_wp); recalculate_sizes(); |