From 1ee1bff64338dede1f72981a6f3787718ce47335 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Sat, 4 Apr 2020 18:25:09 +0300 Subject: [PATCH] desktop: Remove the active surface only if matches the one being displayed We incorrectly removed the active surface being displayed even if it wasn't the one currently displayed, so this patch only removes the active surface if the surface being removed is the same as the one being displayed. Bug-AGL: SPEC-3318 Signed-off-by: Marius Vlad Change-Id: I78c19692d59c3e355b2d140b75d8aadc9d8f2009 --- src/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desktop.c b/src/desktop.c index 7c6c19a..da28fc6 100644 --- a/src/desktop.c +++ b/src/desktop.c @@ -117,7 +117,7 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata) return; /* reset the active surface as well */ - if (output && output->active) { + if (output && output->active && output->active == surface) { output->active->view->is_mapped = false; output->active->view->surface->is_mapped = false; -- 2.16.6