weston-ivi-shell: Remove child context of a layer when the main context of the layer is removed

Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp>

1 files changed, 4 insertions, 4 deletions

diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c
index 7ed8325..82aca40 100755
--- a/weston-ivi-shell/src/ivi-controller.c
+++ b/weston-ivi-shell/src/ivi-controller.c
@@ -213,6 +213,7 @@ destroy_ivicontroller_layer(struct wl_resource *resource)
 
         wl_list_remove(&ctrllayer->link);
         --ivilayer->controller_layer_count;
+        ivi_controller_layer_send_destroyed(ctrllayer->resource);
         free(ctrllayer);
         ctrllayer = NULL;
         break;
@@ -907,12 +908,11 @@ controller_layer_destroy(struct wl_client *client,
 
     ivilayer->layer_canbe_removed = 1;
     wl_list_for_each_safe(ctrllayer, next, &shell->list_controller_layer, link) {
-        if (ctrllayer->resource != resource) {
+        if (ctrllayer->id_layer != id_layer) {
             continue;
-    }
+        }
 
-        wl_resource_destroy(resource);
-        break;
+        wl_resource_destroy(ctrllayer->resource);
     }
 }