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

idle_inhibit: fix crash during view destruction

Browse source 
This fixes a crash for application set idle inhibitors when their
associated view is being destroyed. There is a call to
`view_is_visible` to determine is the view is visible and it assumes
that the view has an container, but it is possible for the container
to already have been destroyed at this point. There is a NULL check for
the view in `check_active` and this re-adds the NULL check for the
container that I accidentally dropped when refactoring during the
inhibit_idle command PR
This commit is contained in:
Brian Ashworth 2019-04-02 11:51:46 -04:00 committed by emersion
parent f0f20f96aa
commit 0ad905f23c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sway/desktop/idle_inhibit_v1.c
View file

@ -93,7 +93,8 @@ static bool check_active(struct sway_idle_inhibitor_v1 *inhibitor) {
switch (inhibitor->mode) { switch (inhibitor->mode) {
case INHIBIT_IDLE_APPLICATION: case INHIBIT_IDLE_APPLICATION:
// If there is no view associated with the inhibitor, assume visible // If there is no view associated with the inhibitor, assume visible
return !inhibitor->view || view_is_visible(inhibitor->view); return !inhibitor->view || !inhibitor->view->container ||
view_is_visible(inhibitor->view);
case INHIBIT_IDLE_FOCUS:; case INHIBIT_IDLE_FOCUS:;
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
wl_list_for_each(seat, &server.input->seats, link) { wl_list_for_each(seat, &server.input->seats, link) {