diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-12-28 23:57:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-28 23:57:34 -0500 |
| commit | f50d1615748d6169da773ed8bd4679eac87f0f99 (patch) | |
| tree | ca60bdc856420faf46f552424c3838bcf779b6fe /sway/tree | |
| parent | 9bf1b7a029afe2fdb07cb2bfe35cca4ad76098f9 (diff) | |
| parent | dd8d2dedf79ef1000ec0495e1c1c27210be8919f (diff) | |
Merge pull request #3345 from RyanDwyer/fix-scratchpad-crash
Fix crash when scratchpad contains split containers
Diffstat (limited to 'sway/tree')
| -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 22c46aba..e1624863 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -145,7 +145,7 @@ void root_scratchpad_hide(struct sway_container *con) { container_detach(con); 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)); } list_move_to_end(root->scratchpad, con); |