raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=31ca5a490e0ed6d84bd5a09a1b85e2fde4b1f3a6
commit 31ca5a490e0ed6d84bd5a09a1b85e2fde4b1f3a6 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Fri Nov 27 10:31:37 2020 +0000 e - be less noisy and dont assum zoomobj is always there efl nicely skips failure and makes these nops but it does complain - better to check before doing that. --- src/bin/e_comp_object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 8a3b88bec..cbebe01d2 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -723,7 +723,7 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw) /* breaks animation counter */ //if (cw->ec->iconic) //e_comp_object_signal_emit(cw->smart_obj, "e,action,iconify", "e"); - if (!cw->zoomap_disabled) + if ((!cw->zoomap_disabled) && (cw->zoomobj)) e_zoomap_child_set(cw->zoomobj, NULL); if (cw->frame_object) { @@ -732,7 +732,7 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw) edje_object_part_swallow(cw->frame_object, "e.swallow.volume", cw->frame_volume); if (cw->zoomap_disabled) edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->frame_object); - else + else if (cw->zoomobj) { e_zoomap_child_set(cw->zoomobj, cw->frame_object); edje_object_part_swallow(cw->shobj, "e.swallow.content", cw->zoomobj); @@ -755,7 +755,7 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw) else evas_object_pass_events_set(cw->obj, 0); #ifdef BORDER_ZOOMAPS - e_zoomap_child_edje_solid_setup(cw->zoomobj); + if (cw->zoomobj) e_zoomap_child_edje_solid_setup(cw->zoomobj); #endif return EINA_TRUE; } --
