diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2018-05-22 14:10:48 -0700 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2018-05-24 16:02:20 -0700 |
commit | b1954ce1e79ff3088f8d1766a5d37fca48731d54 (patch) | |
tree | d16fff05206862239af678e68dccedd28cd29f7d /src/lib/eo/eo_base_class.c | |
parent | 4a3b0e7f2516f41f86e382112f933d40b19053bf (diff) |
eo: move wref set to NULL to append after last event.
Making wref disapear before the last event require additional work to use
them during the FREE event. As I think we should introduce a wref that
disapear after the invalidate state, it makes sense to move that to a later
stage. Especially because their is no specific event related to them
being set to NULL.
Diffstat (limited to 'src/lib/eo/eo_base_class.c')
-rw-r--r-- | src/lib/eo/eo_base_class.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index 2457df6..8687b9b 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c | |||
@@ -2179,8 +2179,6 @@ composite_obj_back: | |||
2179 | if (pd->parent) goto err_parent; | 2179 | if (pd->parent) goto err_parent; |
2180 | err_parent_back: | 2180 | err_parent_back: |
2181 | 2181 | ||
2182 | _wref_destruct(pd); | ||
2183 | |||
2184 | // this isn't 100% correct, as the object is still "slightly" alive at this | 2182 | // this isn't 100% correct, as the object is still "slightly" alive at this |
2185 | // point (so efl_destructed_is() returns false), but triggering the | 2183 | // point (so efl_destructed_is() returns false), but triggering the |
2186 | // "destruct" event here is the simplest, safest solution. | 2184 | // "destruct" event here is the simplest, safest solution. |
@@ -2191,6 +2189,8 @@ err_parent_back: | |||
2191 | _eo_generic_data_del_all(obj, pd); | 2189 | _eo_generic_data_del_all(obj, pd); |
2192 | _eo_callback_remove_all(pd); | 2190 | _eo_callback_remove_all(pd); |
2193 | 2191 | ||
2192 | _wref_destruct(pd); | ||
2193 | |||
2194 | ext = pd->ext; | 2194 | ext = pd->ext; |
2195 | // it is rather likely we dont have any extension section for most objects | 2195 | // it is rather likely we dont have any extension section for most objects |
2196 | // so return immediately here to avoid pulling in more instructions to | 2196 | // so return immediately here to avoid pulling in more instructions to |