sway

commit debb8e85b2808e4b5e8ff79a702ffc48efc36389
parent 9d1f6e095b08252585e6279cd32391a23a877998
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Fri, 27 Jul 2018 13:46:01 +1000

Fix crash when unfloating child of container into empty workspace

Diffstat:
M
sway/tree/container.c
 | 
9
++++++---

1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -1030,10 +1030,13 @@ void container_set_floating(struct sway_container *container, bool enable) {
 		if (container->scratchpad) {
 			scratchpad_remove_container(container);
 		}
-		struct sway_container *sibling =
-			seat_get_focus_inactive_tiling(seat, workspace);
 		container_remove_child(container);
-		container_add_sibling(sibling, container);
+		struct sway_container *reference =
+			seat_get_focus_inactive_tiling(seat, workspace);
+		if (reference->type == C_VIEW) {
+			reference = reference->parent;
+		}
+		container_add_child(reference, container);
 		container->width = container->parent->width;
 		container->height = container->parent->height;
 		if (container->type == C_VIEW) {