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
This commit is contained in:
Tom Hacohen 2011-05-30 08:42:26 +00:00
parent 0b72b9fcf5
commit a3719b21f9
2 changed files with 2 additions and 2 deletions

View File

@ -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,

View File

@ -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,