mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix scratchpad segfault - NULL focused workspace

Browse source 
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.
This commit is contained in:
Brian Ashworth 2018-11-28 12:57:58 -05:00
parent 5341e034df
commit f52277f66e
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/tree/root.c
View file

@ -69,13 +69,16 @@ void root_scratchpad_add_container(struct sway_container *con) {
list_add(root->scratchpad, con); list_add(root->scratchpad, con);
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
struct sway_node *new_focus = NULL;
if (parent) { if (parent) {
arrange_container(parent); arrange_container(parent);
seat_set_focus(seat, seat_get_focus_inactive(seat, &parent->node)); new_focus = seat_get_focus_inactive(seat, &parent->node);
} else {
arrange_workspace(workspace);
seat_set_focus(seat, seat_get_focus_inactive(seat, &workspace->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"); ipc_event_window(con, "move");
} }