X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=eaace1922defb972b3cf0f59264926aac95d159c;hb=a17bac48464b5f2b6359856a75caae882d9a48f6;hp=a637ddd303212848c9c2499f957a00d8b9732c75;hpb=08ea4a2fec76b4bdd90b6072ff1002d0829afbed;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index a637ddd..eaace19 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -25,8 +25,8 @@
 
 #include "ivi-compositor.h"
 
-#include <libweston-6/compositor.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/libweston.h>
+#include <libweston-desktop/libweston-desktop.h>
 
 #if 0
 static struct weston_output *
@@ -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);
 	}
+
+	wl_list_remove(&surface->link);
 	free(surface);
 }