X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=efebfc167dbaf1c231b04358871fa378c934b103;hb=b13e185e7214218ca00025a480695392aa5cdee2;hp=a0cb2d2fa80793a35d3819722c7e5185bbb02f7a;hpb=6d4038380b39f2047ec269017654208f1c01fbd3;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index a0cb2d2..efebfc1 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -134,7 +134,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	surface->ivi = ivi;
 	surface->dsurface = dsurface;
 	surface->role = IVI_SURFACE_ROLE_NONE;
-	surface->activated_by_default = false;
+	surface->mapped = false;
 	surface->advertised_on_launch = false;
 	surface->checked_pending = false;
 	wl_list_init(&surface->link);
@@ -442,7 +442,9 @@ ivi_shell_destroy(struct wl_listener *listener, void *data)
 	struct ivi_compositor *ivi = container_of(listener,
 				struct ivi_compositor, destroy_listener);
 
+	weston_desktop_destroy(ivi->desktop);
 	ivi_compositor_destroy_pending_surfaces(ivi);
+	wl_list_remove(&listener->link);
 }
 
 int