summaryrefslogtreecommitdiff
path: root/src/lib/eo/eo_base_class.c
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2018-05-17 12:06:44 -0700
committerCedric BAIL <cedric@osg.samsung.com>2018-05-24 16:02:20 -0700
commitfa795b17d316d6158aadcc2c3f18f15bc97c8364 (patch)
tree4d64b6048c35ac2e2dd689cc7a2a35d8f2d80ddd /src/lib/eo/eo_base_class.c
parenta90b5fa930114c756147ae8d15317e5eaa7b4013 (diff)
eo: allow efl_part during object invalidate.
Diffstat (limited to 'src/lib/eo/eo_base_class.c')
-rw-r--r--src/lib/eo/eo_base_class.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index 9d1c405..2457df6 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -714,7 +714,7 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
714 if (parent_id != NULL) 714 if (parent_id != NULL)
715 { 715 {
716 EO_OBJ_POINTER_GOTO(parent_id, parent_obj, err_impossible); 716 EO_OBJ_POINTER_GOTO(parent_id, parent_obj, err_impossible);
717 bad_parent = parent_obj->invalidate || parent_obj->is_invalidating; 717 bad_parent = parent_obj->invalidate;
718 EO_OBJ_DONE(parent_id); 718 EO_OBJ_DONE(parent_id);
719 } 719 }
720 720
@@ -722,13 +722,8 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id)
722 722
723 EO_OBJ_POINTER_GOTO(obj, eo_obj, err_impossible); 723 EO_OBJ_POINTER_GOTO(obj, eo_obj, err_impossible);
724 724
725 if (eo_obj->is_invalidating && parent_id == NULL)
726 {
727 EO_OBJ_DONE(obj);
728 return ;
729 }
730 // Invalidated object can not be bring back to life 725 // Invalidated object can not be bring back to life
731 if (eo_obj->invalidate || eo_obj->is_invalidating) 726 if (eo_obj->invalidate)
732 { 727 {
733 ERR("Call of efl_parent_set(%p, %p) when object of clas '%s' is already invalidated.\n", obj, parent_id, efl_class_name_get(obj)); 728 ERR("Call of efl_parent_set(%p, %p) when object of clas '%s' is already invalidated.\n", obj, parent_id, efl_class_name_get(obj));
734 goto err_impossible; 729 goto err_impossible;