X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;fp=src%2Fdesktop.c;h=7127c2d6b01bdee63f36e78ff089bde00568f80a;hb=7239ababba46f5ca3bddd0add65acd5777e832d8;hp=f7d11b1d3a6ce9b8bd94d473e67f3b47c512c8dc;hpb=47d79bb6a1f1f31c538c5b98326c34d6af4fb12d;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index f7d11b1..7127c2d 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -96,6 +96,7 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	surface->activated_by_default = false;
 	surface->advertised_on_launch = false;
 	surface->checked_pending = false;
+	wl_list_init(&surface->link);
 
 	wl_signal_init(&surface->signal_advertise_app);
 
@@ -238,9 +239,7 @@ skip_output_asignment:
 			weston_desktop_surface_get_app_id(dsurface),
 			ivi_layout_get_surface_role_name(surface));
 
-	/* we weren't added to any list if we are still with 'none' as role */
-	if (surface->role != IVI_SURFACE_ROLE_NONE)
-		wl_list_remove(&surface->link);
+	wl_list_remove(&surface->link);
 
 	free(surface);
 }