mirror of
https://github.com/swaywm/sway.git
synced 2024-11-23 00:11:28 +00:00
Merge pull request #3345 from RyanDwyer/fix-scratchpad-crash
Fix crash when scratchpad contains split containers
This commit is contained in:
commit
f50d161574
|
@ -145,7 +145,7 @@ void root_scratchpad_hide(struct sway_container *con) {
|
||||||
|
|
||||||
container_detach(con);
|
container_detach(con);
|
||||||
arrange_workspace(ws);
|
arrange_workspace(ws);
|
||||||
if (&con->node == focus) {
|
if (&con->node == focus || node_has_ancestor(focus, &con->node)) {
|
||||||
seat_set_focus(seat, seat_get_focus_inactive(seat, &ws->node));
|
seat_set_focus(seat, seat_get_focus_inactive(seat, &ws->node));
|
||||||
}
|
}
|
||||||
list_move_to_end(root->scratchpad, con);
|
list_move_to_end(root->scratchpad, con);
|
||||||
|
|
Loading…
Reference in a new issue