From 48254d857fc8cb82b124b423c1208e2df76f3fcf Mon Sep 17 00:00:00 2001 From: Wataru Natsume Date: Tue, 14 Jun 2016 22:16:59 +0900 Subject: ivi-controller: do refactor send_surface_add_event Check logic should be improved because ivilayer is never null. Signed-off-by: Wataru Natsume --- weston-ivi-shell/src/ivi-controller-impl.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/weston-ivi-shell/src/ivi-controller-impl.c b/weston-ivi-shell/src/ivi-controller-impl.c index af79ded..a8242f6 100644 --- a/weston-ivi-shell/src/ivi-controller-impl.c +++ b/weston-ivi-shell/src/ivi-controller-impl.c @@ -164,27 +164,22 @@ send_surface_add_event(struct ivisurface *ivisurf, else if (mask & IVI_NOTIFICATION_ADD) { for (i = 0; i < (int)length; i++) { /* Send new surface event */ - ivilayer = NULL; if (wl_list_empty(&shell->list_layer)) { break; } wl_list_for_each(ivilayer, &shell->list_layer, link) { if (ivilayer->layout_layer == pArray[i]) { + layer_resource = + wl_resource_find_for_client(&ivilayer->resource_list, + client); + if (layer_resource != NULL) { + ivi_controller_surface_send_layer(resource, layer_resource); + } + break; } } - - if (ivilayer == NULL) { - continue; - } - - layer_resource = wl_resource_find_for_client(&ivilayer->resource_list, - client); - - if (layer_resource != NULL) { - ivi_controller_surface_send_layer(resource, layer_resource); - } } } -- cgit v1.2.1