sway

commit 9924d72ab2c7a1202f8590f65377de23e8e39522
parent 67c7cc53ae1d652a1ccb6375e243e3cfca37aa4e
Author: emersion <contact@emersion.fr>
Date:   Wed, 28 Nov 2018 19:16:01 +0100

Merge pull request #3213 from RedSoxFan/fix-3203

Fix scratchpad segfault - NULL focused workspace
Diffstat:
M
sway/tree/root.c
 | 
9
++++++---

1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sway/tree/root.c b/sway/tree/root.c
@@ -69,13 +69,16 @@ void root_scratchpad_add_container(struct sway_container *con) {
 	list_add(root->scratchpad, con);
 
 	struct sway_seat *seat = input_manager_current_seat();
+	struct sway_node *new_focus = NULL;
 	if (parent) {
 		arrange_container(parent);
-		seat_set_focus(seat, seat_get_focus_inactive(seat, &parent->node));
-	} else {
+		new_focus = seat_get_focus_inactive(seat, &parent->node);
+	}
+	if (!new_focus) {
 		arrange_workspace(workspace);
-		seat_set_focus(seat, seat_get_focus_inactive(seat, &workspace->node));
+		new_focus = seat_get_focus_inactive(seat, &workspace->node);
 	}
+	seat_set_focus(seat, new_focus);
 
 	ipc_event_window(con, "move");
 }