summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalii Vorobiov <vi.vorobiov@samsung.com>2016-08-02 16:46:40 +0300
committerVitalii Vorobiov <vi.vorobiov@samsung.com>2016-08-02 17:01:33 +0300
commitdde1299182de2234fe1d4a2d4e714e78d710ff94 (patch)
treec30041d2ccf9033e425dbc315bdd3a3b53cdb328
parentea2b5e40485a49b5c5aadae98ed379f1c3cf5f71 (diff)
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
-rw-r--r--src/lib/edje/edje_edit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index e559f7d795..972ea88a09 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
4092 4092
4093 if ((rp->typedata.swallow) && (rp->typedata.swallow->swallowed_object)) 4093 if ((rp->typedata.swallow) && (rp->typedata.swallow->swallowed_object))
4094 { 4094 {
4095 _edje_real_part_swallow_clear(ed, rp);
4096 evas_object_del(rp->typedata.swallow->swallowed_object); 4095 evas_object_del(rp->typedata.swallow->swallowed_object);
4097 rp->typedata.swallow->swallowed_object = NULL; 4096 _edje_real_part_swallow_clear(ed, rp);
4098 } 4097 }
4099 if (source) 4098 if (source)
4100 { 4099 {