* 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))
+ if ((output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE ||
+ surface->role == IVI_SURFACE_ROLE_DESKTOP)) ||
+ output->output == NULL)
goto skip_output_asignment;
assert(output != NULL);
weston_log("Removed surface %p, app_id %s, role %s\n", surface,
app_id, ivi_layout_get_surface_role_name(surface));
- if (app_id && output) {
+ if (app_id && output && output->output) {
shell_advertise_app_state(output->ivi, app_id,
NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
if (output->ivi->shell_client.ready)
return;
if (ivi->shell_client.ready && !surface->checked_pending) {
- const char * app_id = weston_desktop_surface_get_app_id(dsurface);
+ struct ivi_output *remote_output = NULL;
+ const char *app_id = weston_desktop_surface_get_app_id(dsurface);
weston_log("Checking pending surface %p, app_id %s\n", surface,
app_id);
wl_list_remove(&surface->link);
wl_list_init(&surface->link);
+
+ if ((remote_output = ivi_layout_find_with_app_id(app_id, ivi))) {
+ ivi_set_pending_desktop_surface_remote(remote_output, app_id);
+ shell_send_app_on_output(ivi, app_id, remote_output->output->name);
+ }
+
+
ivi_check_pending_desktop_surface(surface);
surface->checked_pending = true;
ivi_shell_finalize(ivi);
ivi_compositor_destroy_pending_surfaces(ivi);
+ ivi_layout_destroy_saved_outputs(ivi);
weston_desktop_destroy(ivi->desktop);
wl_list_remove(&listener->link);