From: Sohyun Kim Date: Mon, 17 Jan 2011 01:13:19 +0000 (+0900) Subject: [elm_widget][merge] bug fix for default theme reloading X-Git-Tag: REL_I9200_20110603-1~471 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d904b82a8a0f9f3b031c6b9b76d2a71e1577426;p=framework%2Fuifw%2Felementary.git [elm_widget][merge] bug fix for default theme reloading --- diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 48393b5..8d2243d 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -479,12 +479,15 @@ elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force) Evas_Object *child; Elm_Tooltip *tt; Elm_Cursor *cur; - Elm_Theme *th2; + Elm_Theme *th2, *thdef; API_ENTRY return; + thdef = elm_theme_default_get(); + if (!th) th = thdef; if (!force) { th2 = sd->theme; + if (!th2) th2 = thdef; while (th2) { if (th2 == th) @@ -492,7 +495,9 @@ elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force) force = EINA_TRUE; break; } - th2 = th->ref_theme; + if (th2 == thdef) break; + th2 = th2->ref_theme; + if (!th2) th2 = thdef; } } if (!force) return;