X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=236724b1a427b072d141bd6d350916d25cff92a5;hb=e0110aa587acfa5b011162ea86873675c2fc96d9;hp=5b7b2e5eea4b9fff72563145f9d5d32d65e18508;hpb=572d0eac44f115c6a97dae826afd4c6e43fbe4a7;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 5b7b2e5..236724b 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -96,8 +96,14 @@ desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
 
 	app_id = weston_desktop_surface_get_app_id(dsurface);
 
-	if ((active_output = ivi_layout_find_with_app_id(app_id, ivi)))
+	if ((active_output = ivi_layout_find_with_app_id(app_id, ivi))) {
+		weston_log("Found active_output %s for app_id %s\n",
+				active_output->output->name, app_id);
 		ivi_set_pending_desktop_surface_remote(active_output, app_id);
+	}
+
+	/* reset any caps to make sure we apply the new caps */
+	ivi_seat_reset_caps_sent(ivi);
 
 	if (ivi->shell_client.ready) {
 		ivi_check_pending_desktop_surface(surface);
@@ -139,8 +145,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);