diff options
| author | Brian Ashworth <bosrsf04@gmail.com> | 2019-04-02 13:17:01 -0400 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-04-03 19:45:17 +0300 |
| commit | f0f20f96aa5cea382ca079b6a88fbcaf5b3782ad (patch) | |
| tree | 86ad935b1ecd5d77659c68523ec092a2c872745a | |
| parent | 1e1d9e12991e9a9be72da1fe0c887d9087dffe3a (diff) | |
root_scratchpad_hide: fix crash when layer focused
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).
| -rw-r--r-- | sway/tree/root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/root.c b/sway/tree/root.c index 3d93405e..c7c5e1df 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -135,7 +135,7 @@ void root_scratchpad_show(struct sway_container *con) { void root_scratchpad_hide(struct sway_container *con) { 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; container_detach(con); |