diff options
| author | Mike Blumenkrantz <m.blumenkran@samsung.com> | 2013-05-09 11:27:50 +0100 |
|---|---|---|
| committer | Mike Blumenkrantz <m.blumenkran@samsung.com> | 2013-05-09 11:27:50 +0100 |
| commit | 979e8e17b7ed97c1771ad100b0abc43103074b7c (patch) | |
| tree | c90cd7b166842bcc722f673c7c4984dd3133aa23 | |
| parent | cac30b8e0a9f6282230ebf0c36d3735258d03170 (diff) | |
| download | efl-979e8e17b7ed97c1771ad100b0abc43103074b7c.tar.gz | |
TEMPORARY EDJE FIX
edje proxy parts seem to break (crash) when animating a state change from custom->default on an animator. adding a null check here avoids that and seems to work fine, but I am not an edje_calc expert
| -rw-r--r-- | src/lib/edje/edje_calc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 56cb1d2016..26614e25e7 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -2437,7 +2437,7 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj Edje_Real_Part *pp; int part_id = -1; - if (pos >= FROM_DOUBLE(0.5)) + if (ep->param2 && (pos >= FROM_DOUBLE(0.5))) part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id; else part_id = chosen_desc->proxy.id; @@ -2952,7 +2952,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta { int part_id = -1; - if (pos >= FROM_DOUBLE(0.5)) + if (ep->param2 && (pos >= FROM_DOUBLE(0.5))) part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id; else part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id; |