X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fdesktop.c;h=26569d60c1277f9171ca4ef08c0c9b0685ba474c;hb=ab2e660c891df7188f2803a88d172627d66294fe;hp=a637ddd303212848c9c2499f957a00d8b9732c75;hpb=f8457f6d62370f08a4764f44c670bd2368e80415;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index a637ddd..26569d6 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -102,15 +102,26 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 	struct weston_surface *wsurface =
 		weston_desktop_surface_get_surface(dsurface);
 
+	struct ivi_output *output = surface->desktop.last_output;
+
 	/* TODO */
 	if (surface->role != IVI_SURFACE_ROLE_DESKTOP)
 		return;
 
+	/* reset the active surface as well */
+	if (output && output->active) {
+		output->active->view->is_mapped = false;
+		output->active->view->surface->is_mapped = false;
+
+		weston_layer_entry_remove(&output->active->view->layer_link);
+		output->active = NULL;
+	}
 	if (weston_surface_is_mapped(wsurface)) {
 		weston_desktop_surface_unlink_view(surface->view);
 		weston_view_destroy(surface->view);
 		wl_list_remove(&surface->link);
 	}
+
 	free(surface);
 }