furrymyad pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=dde1299182de2234fe1d4a2d4e714e78d710ff94

commit dde1299182de2234fe1d4a2d4e714e78d710ff94
Author: Vitalii Vorobiov <[email protected]>
Date:   Tue Aug 2 16:46:40 2016 +0300

    edje_edit: delete swallowed object before unswallowing (for part type GROUP)
    
    unswallowing set swallowed_object to NULL inside of
    _edje_real_part_swallow_clear
    so it is impossible to delete object anymore.
    And so, changing sources leaves fantoms and undeleted objects.
    
    @fix
---
 src/lib/edje/edje_edit.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index e559f7d..972ea88 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -4092,9 +4092,8 @@ edje_edit_part_source_set(Evas_Object *obj, const char 
*part, const char *source
 
         if ((rp->typedata.swallow) && (rp->typedata.swallow->swallowed_object))
           {
-             _edje_real_part_swallow_clear(ed, rp);
              evas_object_del(rp->typedata.swallow->swallowed_object);
-             rp->typedata.swallow->swallowed_object = NULL;
+             _edje_real_part_swallow_clear(ed, rp);
           }
         if (source)
           {

-- 


Reply via email to