sway

commit 3b8dd4958311f40701e352bf49b62ae850cdd2f9
parent bb6c9f52c789a7058dbff6a3abb80f8ff5d778ba
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sat, 20 Oct 2018 01:18:23 +0200

Merge pull request #2885 from RyanDwyer/fix-tiling-drag-crash

Fix crash when ending tiling drag
Diffstat:
M
sway/input/seat.c
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sway/input/seat.c b/sway/input/seat.c
@@ -1110,9 +1110,6 @@ static void seat_end_move_tiling(struct sway_seat *seat) {
 	int after = edge != WLR_EDGE_TOP && edge != WLR_EDGE_LEFT;
 
 	container_detach(con);
-	if (old_parent) {
-		container_reap_empty(old_parent);
-	}
 
 	// Moving container into empty workspace
 	if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) {
@@ -1135,6 +1132,10 @@ static void seat_end_move_tiling(struct sway_seat *seat) {
 		workspace_insert_tiling(new_ws, con, after);
 	}
 
+	if (old_parent) {
+		container_reap_empty(old_parent);
+	}
+
 	// This is a bit dirty, but we'll set the dimensions to that of a sibling.
 	// I don't think there's any other way to make it consistent without
 	// changing how we auto-size containers.