aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/layout.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-06-01 01:06:02 -0400
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-06-01 01:12:10 -0400
commit8237d944d48c0b60ad4038f4a556d4b8d80a9292 (patch)
treea618a4520a3b5ec44e32d0f95fb3d241afe5bb71 /sway/tree/layout.c
parentMerge pull request #2079 from RedSoxFan/fix-2078 (diff)
downloadsway-8237d944d48c0b60ad4038f4a556d4b8d80a9292.tar.gz
sway-8237d944d48c0b60ad4038f4a556d4b8d80a9292.tar.zst
sway-8237d944d48c0b60ad4038f4a556d4b8d80a9292.zip
Fix move perpendicular segfault
Diffstat (limited to 'sway/tree/layout.c')
-rw-r--r--sway/tree/layout.c3
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,
521 sibling = NULL; 521 sibling = NULL;
522 } else { 522 } else {
523 wlr_log(L_DEBUG, "Reparenting container (perpendicular)"); 523 wlr_log(L_DEBUG, "Reparenting container (perpendicular)");
524 container_remove_child(container);
525 struct sway_container *focus_inactive = seat_get_focus_inactive( 524 struct sway_container *focus_inactive = seat_get_focus_inactive(
526 config->handler_context.seat, sibling); 525 config->handler_context.seat, sibling);
527 if (focus_inactive) { 526 if (focus_inactive) {
@@ -534,9 +533,11 @@ void container_move(struct sway_container *container,
534 continue; 533 continue;
535 } else if (sibling->children->length) { 534 } else if (sibling->children->length) {
536 wlr_log(L_DEBUG, "No focus-inactive, adding arbitrarily"); 535 wlr_log(L_DEBUG, "No focus-inactive, adding arbitrarily");
536 container_remove_child(container);
537 container_add_sibling(sibling->children->items[0], container); 537 container_add_sibling(sibling->children->items[0], container);
538 } else { 538 } else {
539 wlr_log(L_DEBUG, "No kiddos, adding container alone"); 539 wlr_log(L_DEBUG, "No kiddos, adding container alone");
540 container_remove_child(container);
540 container_add_child(sibling, container); 541 container_add_child(sibling, container);
541 } 542 }
542 container->width = container->height = 0; 543 container->width = container->height = 0;