From: tiago Date: Wed, 14 Apr 2010 16:34:06 +0000 (+0000) Subject: Fix state_apply without animation. X-Git-Tag: submit/2.0alpha-wayland/20121127.221958~1327 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e30c05ca3501d23355241312d51c7980b923ac1;p=profile%2Fivi%2Fedje.git Fix state_apply without animation. Used in edje_edit_part_selected_state_set. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@48000 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c index 1dafadb..a889dd6 100644 --- a/src/lib/edje_calc.c +++ b/src/lib/edje_calc.c @@ -106,16 +106,16 @@ void _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, double v1, const char *d2, double v2) { Edje_Part_Description *epd1; - Edje_Part_Description *epd2; + Edje_Part_Description *epd2 = NULL; if (!d1) d1 = "default"; - if (!d2) d2 = "default"; epd1 = _edje_part_description_find(ed, ep, d1, v1); if (!epd1) epd1 = ep->part->default_desc; /* never NULL */ - epd2 = _edje_part_description_find(ed, ep, d2, v2); + if (d2) + epd2 = _edje_part_description_find(ed, ep, d2, v2); /* There is an animation if both description are different or if description is an image with tweens */ if (epd2 != NULL && (epd1 != epd2 || (ep->part->type == EDJE_PART_TYPE_IMAGE && epd2->image.tween_list)))