From e6c6dcfb483adc5222a7a08654fb718362f73130 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 25 Jun 2018 06:38:07 -0400 Subject: [PATCH] eo: remove some erroneous mutex unlocks during base class parent_set errors recent changes added unlocks for these mutexes in some other places, so only do the unlocks where necessary fix T7020 Depends on D6356 Differential Revision: https://phab.enlightenment.org/D6357 --- src/lib/eo/eo_base_class.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index 05b81dd..1ef4320 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c @@ -767,7 +767,7 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id) if (prev_parent) efl_unref(obj); // unlikely this error happens, so move it out of execution path // to improve l1 cache efficiency - goto err_parent; + goto err_parent_done; } eo_obj->parent = EINA_TRUE; @@ -783,10 +783,11 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id) EO_OBJ_DONE(obj); return; +err_parent_done: + EO_OBJ_DONE(obj); err_parent: ERR("New parent %p for object %p is not a valid Eo object.", parent_id, obj); - EO_OBJ_DONE(obj); return; err_impossible: -- 2.7.4