diff options
| author | emersion <contact@emersion.fr> | 2018-06-01 09:43:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 09:43:40 +0100 |
| commit | 8963f94545ad93f6e3a2c156dbf866e8f8d89c55 (patch) | |
| tree | a618a4520a3b5ec44e32d0f95fb3d241afe5bb71 /sway | |
| parent | 4495ec64b2c41ba890d7982d1cf60a3099eb4c97 (diff) | |
| parent | 8237d944d48c0b60ad4038f4a556d4b8d80a9292 (diff) | |
Merge pull request #2082 from RedSoxFan/fix-move-perpendicular-segfault
Fix move perpendicular segfault
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/tree/layout.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c index b175f567..bc7ee6bb 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -521,7 +521,6 @@ void container_move(struct sway_container *container, sibling = NULL; } else { wlr_log(L_DEBUG, "Reparenting container (perpendicular)"); - container_remove_child(container); struct sway_container *focus_inactive = seat_get_focus_inactive( config->handler_context.seat, sibling); if (focus_inactive) { @@ -534,9 +533,11 @@ void container_move(struct sway_container *container, continue; } else if (sibling->children->length) { wlr_log(L_DEBUG, "No focus-inactive, adding arbitrarily"); + container_remove_child(container); container_add_sibling(sibling->children->items[0], container); } else { wlr_log(L_DEBUG, "No kiddos, adding container alone"); + container_remove_child(container); container_add_child(sibling, container); } container->width = container->height = 0; |