* 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 &&
- wl_resource_get_version(output->ivi->shell_client.resource)
- >= AGL_SHELL_APP_STATE_SINCE_VERSION)
- agl_shell_send_app_state(output->ivi->shell_client.resource,
- app_id, AGL_SHELL_APP_STATE_TERMINATED);
+ if (output->ivi->shell_client.ready)
+ shell_send_app_state(output->ivi, app_id, AGL_SHELL_APP_STATE_TERMINATED);
}
wl_list_remove(&surface->link);
/* we'll do it now at commit time, because we might not have an
* appid by the time we've created the weston_desktop_surface
* */
- if (wl_resource_get_version(ivi->shell_client.resource) >= AGL_SHELL_APP_STATE_SINCE_VERSION)
- agl_shell_send_app_state(ivi->shell_client.resource,
- app_id, AGL_SHELL_APP_STATE_STARTED);
+ shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_STARTED);
}
if (!surface->advertised_on_launch &&