From 8237d944d48c0b60ad4038f4a556d4b8d80a9292 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Fri, 1 Jun 2018 01:06:02 -0400 Subject: Fix move perpendicular segfault --- sway/tree/layout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sway') 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; -- cgit v1.2.3