From: tasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Mon, 30 May 2011 08:42:26 +0000 (+0000)
Subject: Evas text/textblock: Check we actually found a font instance.
X-Git-Tag: submit/trunk/20120815.174732~1420
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7acd37a75e5b717bdb5ac72cf69cb1ff0c3bd7b2;p=profile%2Fivi%2Fevas.git

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.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@59804 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/canvas/evas_object_text.c b/src/lib/canvas/evas_object_text.c
index aa7d84e..4bf7397 100644
--- a/src/lib/canvas/evas_object_text.c
+++ b/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/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index d56ff50..388ee7c 100644
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/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,