Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-28 22:23:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

root_scratchpad_hide: fix crash when layer focused

Browse source 
This fixes a crash in `root_scratchpad_hide` when a layer surface is
focused. Since `seat_get_focus` is NULL when a layer surface is
focused, the call to `node_has_ancestor` was causing a SIGSEGV since it
was attempting to access the parent of NULL. This changes the call to
`seat_get_focus_inactive`, which will return a node even when a layer
surface is focused and is also guaranteed to have something in the
focus stack if a scratchpad container is being hidden (otherwise there
would not be any containers yet).
This commit is contained in:
Brian Ashworth 2019-04-02 13:17:01 -04:00 committed by emersion
parent 1e1d9e1299
commit f0f20f96aa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/tree/root.c
View file

@ -135,7 +135,7 @@ void root_scratchpad_show(struct sway_container *con) {
void root_scratchpad_hide(struct sway_container *con) { void root_scratchpad_hide(struct sway_container *con) {
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
struct sway_node *focus = seat_get_focus(seat); struct sway_node *focus = seat_get_focus_inactive(seat, &root->node);
struct sway_workspace *ws = con->workspace; struct sway_workspace *ws = con->workspace;
container_detach(con); container_detach(con);