diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2018-06-21 18:44:54 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2018-06-21 18:46:59 -0400 |
| commit | 6d1bb7d2d9ab642e08583d5c9cec8a0482f34c2d (patch) | |
| tree | dc29c76d6396e753bdfa979366ee29ccbea2e173 | |
| parent | 720b374ba03f71d2ae5eb0a89c0c783a2b0f6ebf (diff) | |
| download | efl-6d1bb7d2d9ab642e08583d5c9cec8a0482f34c2d.tar.gz | |
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
| -rw-r--r-- | src/lib/eo/eo_base_class.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index 05b81ddbf2..16d59c0470 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,16 +783,16 @@ _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: ERR("CONTACT DEVS!!! SHOULD NEVER HAPPEN!!! Old parent %p for object %p is not a valid Eo object.", pd->parent, obj); - EO_OBJ_DONE(obj); } EOLIAN static Eo * |