X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fdesktop.c;h=0fca2fd3241a36b3cffe271b3c597f4f07a764c9;hb=794a54e763b293da7743c23311c276601554c759;hp=479174dae32cb7058591194012200568518ee195;hpb=9827cfd255780640650f7c9667daa7802dc1bb34;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 479174d..0fca2fd 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -85,14 +85,14 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 	surface->role = IVI_SURFACE_ROLE_NONE;
 	surface->activated_by_default = false;
 
+	weston_desktop_surface_set_user_data(dsurface, surface);
+
 	if (ivi->policy && ivi->policy->api.surface_create &&
 	    !ivi->policy->api.surface_create(surface, ivi)) {
-		free(surface);
 		wl_client_post_no_memory(client);
 		return;
 	}
 
-	weston_desktop_surface_set_user_data(dsurface, surface);
 
 	app_id = weston_desktop_surface_get_app_id(dsurface);
 
@@ -139,8 +139,13 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 	struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
 
 	/* special corner-case, pending_surfaces which are never activated or
-	 * being assigned an output might land here so just remove the surface */
-	if (output == NULL && surface->role == IVI_SURFACE_ROLE_NONE)
+	 * being assigned an output might land here so just remove the surface;
+	 *
+	 * the DESKTOP role can happen here as well, because we can fall-back 
+	 * to that when we try to determine the role type. Application that
+	 * do not set the app_id will be land here, when destroyed */
+	if (output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE ||
+			       surface->role == IVI_SURFACE_ROLE_DESKTOP))
 		goto skip_output_asignment;
 
 	assert(output != NULL);
@@ -209,7 +214,11 @@ skip_output_asignment:
 	weston_log("Removed surface %p, app_id %s, role %s\n", surface,
 			weston_desktop_surface_get_app_id(dsurface),
 			ivi_layout_get_surface_role_name(surface));
-	wl_list_remove(&surface->link);
+
+	/* 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);
+
 	free(surface);
 }