forked from enlightenment/efl
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
This commit is contained in:
parent
cac30b8e0a
commit
979e8e17b7
|
@ -2437,7 +2437,7 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
|
||||||
Edje_Real_Part *pp;
|
Edje_Real_Part *pp;
|
||||||
int part_id = -1;
|
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;
|
part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id;
|
||||||
else
|
else
|
||||||
part_id = chosen_desc->proxy.id;
|
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;
|
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;
|
part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id;
|
||||||
else
|
else
|
||||||
part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id;
|
part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id;
|
||||||
|
|
Loading…
Reference in New Issue