ivi-controller: do refactor send_layer_add_event

Check logic should be improved because iviscrn is never null.
Besides, do not iterate over empty list like send_surface_add_event.

Signed-off-by: Wataru Natsume <wataru_natsume@xddp.denso.co.jp>

1 files changed, 11 insertions, 12 deletions

diff --git a/weston-ivi-shell/src/ivi-controller-impl.c b/weston-ivi-shell/src/ivi-controller-impl.c
index a8242f6..490f4c1 100644
--- a/weston-ivi-shell/src/ivi-controller-impl.c
+++ b/weston-ivi-shell/src/ivi-controller-impl.c
@@ -292,23 +292,22 @@ send_layer_add_event(struct ivilayer *ivilayer,
     else if (mask & IVI_NOTIFICATION_ADD) {
         for (i = 0; i < (int)length; i++) {
             /* Send new layer event */
-            iviscrn = NULL;
+            if (wl_list_empty(&shell->list_screen)){
+                break;
+            }
+
             wl_list_for_each(iviscrn, &shell->list_screen, link) {
                 if (iviscrn->layout_screen == pArray[i]) {
+                    resource_output =
+                        wl_resource_find_for_client(&iviscrn->output->resource_list,
+                                                    client);
+                    if (resource_output != NULL) {
+                        ivi_controller_layer_send_screen(resource, resource_output);
+                    }
+
                     break;
                 }
             }
-
-            if (iviscrn == NULL) {
-                continue;
-            }
-
-            resource_output =
-                wl_resource_find_for_client(&iviscrn->output->resource_list,
-                                     client);
-            if (resource_output != NULL) {
-                ivi_controller_layer_send_screen(resource, resource_output);
-            }
         }
     }