if ((active_output = ivi_layout_find_with_app_id(app_id, ivi)))
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);
weston_log("Added surface %p, app_id %s, role %s\n", surface,
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);