From 46e2d5e441dfb9f58c377742529f2e106f31660c Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 10 Mar 2021 20:03:07 +0200 Subject: [PATCH] desktop: Send remove event only if output and app_id is set This will guard against clients do not have an application id, or they weren't activated at all. Signed-off-by: Marius Vlad Change-Id: Iee58c0f54efdecce82ff07e0916ebef15f7f64d8 --- src/desktop.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/desktop.c b/src/desktop.c index f32097e..9a5ca54 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -243,8 +243,9 @@ skip_output_asignment: weston_log("Removed surface %p, app_id %s, role %s\n", surface, app_id, ivi_layout_get_surface_role_name(surface)); - shell_advertise_app_state(output->ivi, app_id, - NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED); + if (app_id && output) + shell_advertise_app_state(output->ivi, app_id, + NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED); wl_list_remove(&surface->link); -- 2.16.6