Evas text: Fixed a segfault with text objects with a font not yet set (but with text...
authortasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Sun, 30 Jan 2011 10:45:17 +0000 (10:45 +0000)
committertasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Sun, 30 Jan 2011 10:45:17 +0000 (10:45 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@56537 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/canvas/evas_object_text.c

index 333b50e..18d5654 100644 (file)
@@ -530,12 +530,15 @@ _evas_object_text_item_new(Evas_Object *obj, Evas_Object_Text *o,
    evas_common_text_props_script_set(&it->text_props, it->text);
    ENFN->font_shape(ENDT, o->engine_data, it->text, &it->text_props,
          o->bidi_par_props, it->text_pos, len);
-   ENFN->font_string_size_get(ENDT,
-         o->engine_data,
-         it->text, &it->text_props,
-         &it->w, &it->h);
-   it->adv = ENFN->font_h_advance_get(ENDT, o->engine_data, it->text,
-         &it->text_props);
+   if (o->engine_data)
+     {
+        ENFN->font_string_size_get(ENDT,
+              o->engine_data,
+              it->text, &it->text_props,
+              &it->w, &it->h);
+        it->adv = ENFN->font_h_advance_get(ENDT, o->engine_data, it->text,
+              &it->text_props);
+     }
    o->items = (Evas_Object_Text_Item *)
       eina_inlist_append(EINA_INLIST_GET(o->items), EINA_INLIST_GET(it));
    return it;