summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-06-25 06:38:07 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-06-25 17:17:13 +0200
commit02c62d313576920822a856beec417fd9c007c3fd (patch)
tree01cdac1e4c1e8dd8043340aa220226a43d7be0f0
parentb2e3c483a8fcf434900d23c9e906901df0bb0d65 (diff)
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
-rw-r--r--src/lib/eo/eo_base_class.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 05b81ddbf2..1ef4320673 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)
767 if (prev_parent) efl_unref(obj); 767 if (prev_parent) efl_unref(obj);
768 // unlikely this error happens, so move it out of execution path 768 // unlikely this error happens, so move it out of execution path
769 // to improve l1 cache efficiency 769 // to improve l1 cache efficiency
770 goto err_parent; 770 goto err_parent_done;
771 } 771 }
772 772
773 eo_obj->parent = EINA_TRUE; 773 eo_obj->parent = EINA_TRUE;
@@ -783,10 +783,11 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
783 EO_OBJ_DONE(obj); 783 EO_OBJ_DONE(obj);
784 return; 784 return;
785 785
786err_parent_done:
787 EO_OBJ_DONE(obj);
786err_parent: 788err_parent:
787 ERR("New parent %p for object %p is not a valid Eo object.", 789 ERR("New parent %p for object %p is not a valid Eo object.",
788 parent_id, obj); 790 parent_id, obj);
789 EO_OBJ_DONE(obj);
790 return; 791 return;
791 792
792err_impossible: 793err_impossible: