From f52277f66e85d13589b51a851b9e97c3457ed654 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 28 Nov 2018 12:57:58 -0500 Subject: [PATCH] Fix scratchpad segfault - NULL focused workspace When adding a container to the scratchpad, it was possible for focus to be removed from the seat. This occurred when a single child was moved from it's parent to the scratchpad due to the focus_inactive for the parent being NULL. If the focus_inactive for the parent is NULL, the focus_inactive for the workspace should be focused. --- sway/tree/root.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sway/tree/root.c b/sway/tree/root.c index 9f6bf607..22c46aba 100644 --- 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 { - arrange_workspace(workspace); - seat_set_focus(seat, seat_get_focus_inactive(seat, &workspace->node)); + new_focus = seat_get_focus_inactive(seat, &parent->node); } + if (!new_focus) { + arrange_workspace(workspace); + new_focus = seat_get_focus_inactive(seat, &workspace->node); + } + seat_set_focus(seat, new_focus); ipc_event_window(con, "move"); }