From 0ad905f23cc2862c96401b6a27d918b237db35b5 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Tue, 2 Apr 2019 11:51:46 -0400 Subject: idle_inhibit: fix crash during view destruction 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 --- sway/desktop/idle_inhibit_v1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c index b981e5e5..73e46a8f 100644 --- a/sway/desktop/idle_inhibit_v1.c +++ b/sway/desktop/idle_inhibit_v1.c @@ -93,7 +93,8 @@ static bool check_active(struct sway_idle_inhibitor_v1 *inhibitor) { switch (inhibitor->mode) { case INHIBIT_IDLE_APPLICATION: // 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:; struct sway_seat *seat = NULL; wl_list_for_each(seat, &server.input->seats, link) { -- cgit v1.2.3-54-g00ecf