diff options
| author | Cedric Bail <cedric@osg.samsung.com> | 2018-05-17 12:06:44 -0700 |
|---|---|---|
| committer | Cedric BAIL <cedric@osg.samsung.com> | 2018-05-22 16:55:09 -0700 |
| commit | 227f907e526fb07c4969b392328b07b8fcbfe54f (patch) | |
| tree | 07b35deac1496f5a5a7453c1b7006c55cd8ffee3 | |
| parent | 6ec6e82669353a43087e7491c70ec7a85a4362b5 (diff) | |
| download | efl-227f907e526fb07c4969b392328b07b8fcbfe54f.tar.gz | |
eo: allow efl_part during object invalidate.
| -rw-r--r-- | src/lib/eo/eo_base_class.c | 9 |
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 9d1c405ea6..2457df6c15 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) if (parent_id != NULL) { EO_OBJ_POINTER_GOTO(parent_id, parent_obj, err_impossible); - bad_parent = parent_obj->invalidate || parent_obj->is_invalidating; + bad_parent = parent_obj->invalidate; EO_OBJ_DONE(parent_id); } @@ -722,13 +722,8 @@ _efl_object_parent_set(Eo *obj, Efl_Object_Data *pd, Eo *parent_id) EO_OBJ_POINTER_GOTO(obj, eo_obj, err_impossible); - if (eo_obj->is_invalidating && parent_id == NULL) - { - EO_OBJ_DONE(obj); - return ; - } // Invalidated object can not be bring back to life - if (eo_obj->invalidate || eo_obj->is_invalidating) + if (eo_obj->invalidate) { 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)); goto err_impossible; |