From a7cd34df469af61d17003d3bb985553e29058514 Mon Sep 17 00:00:00 2001 From: Doyoun Kang Date: Thu, 4 Jun 2020 11:09:15 +0900 Subject: [PATCH] e_client: check a layer validation when layer pending/block is set in e_client_below_get Change-Id: I2e1ac8fcbdc00de8d16da4670a3e531041c3e823 --- src/bin/e_client.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 71961ed62a..722c974dc7 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -5150,14 +5150,17 @@ e_client_below_get(const E_Client *ec) // check layer validation ec_layer = ec->layer; - cw_layer = e_comp_object_layer_get(ec->frame); - if (cw_layer >= 0) + if (ec->layer_block || ec->layer_pending) { - ec_layer_cw = e_comp_canvas_layer_map_to(cw_layer); - if (ec_layer != ec_layer_cw) + cw_layer = e_comp_object_layer_get(ec->frame); + if (cw_layer >= 0) { - ELOGF("COMP", "LAYER is not same. USE obj layer! (ec->layer:%d, obj:%d). block:%d, pending:%d)", ec, ec_layer, ec_layer_cw, ec->layer_block, ec->layer_pending); - ec_layer = ec_layer_cw; + ec_layer_cw = e_comp_canvas_layer_map_to(cw_layer); + if (ec_layer != ec_layer_cw) + { + ELOGF("COMP", "LAYER is not same. USE obj layer! (ec->layer:%d, obj:%d). block:%d, pending:%d)", ec, ec_layer, ec_layer_cw, ec->layer_block, ec->layer_pending); + ec_layer = ec_layer_cw; + } } } -- 2.34.1