alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

tree/view: do not attempt enter on hidden child

Browse source 
If a subsurface is created for a surface that is associated with a
scratchpad hidden view, do not attempt to send an enter to it. The
subsurface is not on any output and since there is no workspace
associated with the view, attempting to get the output for the NULL
workspace will result in a SIGSEGV.
This commit is contained in:
Brian Ashworth 2020-02-17 17:12:04 -05:00 committed by Simon Ser
parent d2cab83833
commit 0c23525d47
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/tree/view.c
View file

@ -896,8 +896,10 @@ void view_child_init(struct sway_view_child *child,
wl_signal_add(&view->events.unmap, &child->view_unmap); wl_signal_add(&view->events.unmap, &child->view_unmap);
child->view_unmap.notify = view_child_handle_view_unmap; child->view_unmap.notify = view_child_handle_view_unmap;
struct sway_output *output = child->view->container->workspace->output; struct sway_workspace *workspace = child->view->container->workspace;
wlr_surface_send_enter(child->surface, output->wlr_output); if (workspace) {
wlr_surface_send_enter(child->surface, workspace->output->wlr_output);
}
view_init_subsurfaces(child->view, surface); view_init_subsurfaces(child->view, surface);
} }