alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2082 from RedSoxFan/fix-move-perpendicular-segfault

Browse source 
Fix move perpendicular segfault
This commit is contained in:
emersion 2018-06-01 09:43:40 +01:00 committed by GitHub
parent 4495ec64b2 8237d944d4
commit 8963f94545
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/tree/layout.c
View file

@ -521,7 +521,6 @@ void container_move(struct sway_container *container,
sibling = NULL; sibling = NULL;
} else { } else {
wlr_log(L_DEBUG, "Reparenting container (perpendicular)"); wlr_log(L_DEBUG, "Reparenting container (perpendicular)");
container_remove_child(container);
struct sway_container *focus_inactive = seat_get_focus_inactive( struct sway_container *focus_inactive = seat_get_focus_inactive(
config->handler_context.seat, sibling); config->handler_context.seat, sibling);
if (focus_inactive) { if (focus_inactive) {
@ -534,9 +533,11 @@ void container_move(struct sway_container *container,
continue; continue;
} else if (sibling->children->length) { } else if (sibling->children->length) {
wlr_log(L_DEBUG, "No focus-inactive, adding arbitrarily"); wlr_log(L_DEBUG, "No focus-inactive, adding arbitrarily");
container_remove_child(container);
container_add_sibling(sibling->children->items[0], container); container_add_sibling(sibling->children->items[0], container);
} else { } else {
wlr_log(L_DEBUG, "No kiddos, adding container alone"); wlr_log(L_DEBUG, "No kiddos, adding container alone");
container_remove_child(container);
container_add_child(sibling, container); container_add_child(sibling, container);
} }
container->width = container->height = 0; container->width = container->height = 0;