From a3719b21f9840a86cb74fad12bd66dbbc50c002f Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 30 May 2011 08:42:26 +0000 Subject: [PATCH] Evas text/textblock: Check we actually found a font instance. Currently we only check we have a font_set which is not enough. Having a fontset and not having an fi should never happen, but it can. SVN revision: 59804 --- legacy/evas/src/lib/canvas/evas_object_text.c | 2 +- legacy/evas/src/lib/canvas/evas_object_textblock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c index aa7d84ee2a..4bf7397140 100644 --- a/legacy/evas/src/lib/canvas/evas_object_text.c +++ b/legacy/evas/src/lib/canvas/evas_object_text.c @@ -471,7 +471,7 @@ _evas_object_text_item_new(Evas_Object *obj, Evas_Object_Text *o, it->text_pos); evas_common_text_props_script_set(&it->text_props, script); - if (o->font) + if (fi) { ENFN->font_text_props_info_create(ENDT, fi, str + pos, &it->text_props, diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index d56ff5064e..388ee7cce2 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -2862,7 +2862,7 @@ skip: c->par->bidi_props, ti->parent.text_pos); evas_common_text_props_script_set(&ti->text_props, script); - if (ti->parent.format->font.font) + if (cur_fi) { c->ENFN->font_text_props_info_create(c->ENDT, cur_fi, str, &ti->text_props, c->par->bidi_props,