aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/edje
diff options
context:
space:
mode:
authorDaniel Hirt <hirt.danny@gmail.com>2018-06-20 19:24:05 +0300
committerDaniel Hirt <hirt.danny@gmail.com>2018-06-20 19:34:00 +0300
commitff8c383649bc170d33c40b3a007662afe80f1024 (patch)
treec9e2354b1b1ec92bcd4d9be8e2e0764996465bee /src/lib/edje
parentelm: refactor do not call efl_data_scope_get on a object without data (diff)
downloadefl-ff8c383649bc170d33c40b3a007662afe80f1024.tar.gz
Edje load: add safecheck for TEXTBLOCK-specific code path
There is a specific TEXTBLOCK part code path that shouldn't be taken for other parts. @fixes https://phab.enlightenment.org/T6279
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_load.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index c0d0ac25a3..c974342fc7 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -1328,7 +1328,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
}
}
- if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
+ if ((rp->part->type == EDJE_PART_TYPE_TEXTBLOCK) &&
+ rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
{
_edje_entry_real_part_init(ed, rp);
if (!ed->has_entries)