diff options
Diffstat (limited to 'weston-ivi-shell/src/ivi-controller-impl.c')
| -rw-r--r-- | weston-ivi-shell/src/ivi-controller-impl.c | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/weston-ivi-shell/src/ivi-controller-impl.c b/weston-ivi-shell/src/ivi-controller-impl.c index 15e677e..49069c8 100644 --- a/weston-ivi-shell/src/ivi-controller-impl.c +++ b/weston-ivi-shell/src/ivi-controller-impl.c @@ -802,15 +802,22 @@ controller_layer_destroy(struct wl_client *client, { struct ivilayer *ivilayer = wl_resource_get_user_data(resource); (void)client; - (void)destroy_scene_object; - if (ivilayer->layout_layer != NULL) { - ivi_extension_layer_remove(ivilayer->shell, ivilayer->layout_layer); - ivilayer->layout_layer = NULL; - } + if (destroy_scene_object) { + if (ivilayer->layout_layer != NULL) { + ivi_extension_layer_remove(ivilayer->shell, ivilayer->layout_layer); + ivilayer->layout_layer = NULL; + } - wl_resource_destroy(resource); + wl_resource_destroy(resource); + if (wl_list_empty(&ivilayer->resource_list)) { + wl_list_remove(&ivilayer->link); + free(ivilayer); + } + } else { + wl_resource_destroy(resource); + } } static const @@ -1284,12 +1291,17 @@ layer_event_remove(struct ivi_layout_layer *layout_layer, return; } - wl_resource_for_each(resource, &ivilayer->resource_list) { + /*If there is no ivi_controller_layer objects, free + * ivilayer immediately. Otherwise wait for clients to destroy + * their proxies. */ + if (wl_list_empty(&ivilayer->resource_list)) { + wl_list_remove(&ivilayer->link); + free(ivilayer); + } else { + wl_resource_for_each(resource, &ivilayer->resource_list) { ivi_controller_layer_send_destroyed(resource); + } } - - wl_list_remove(&ivilayer->link); - free(ivilayer); } |