From 91ee528629cfc8e68df4048895ededfad56d3291 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Fri, 5 Sep 2003 07:17:54 +0000
Subject: [PATCH] safety thing... :)

SVN revision: 7416
---
 legacy/edje/src/lib/edje_calc.c    | 4 +++-
 legacy/edje/src/lib/edje_program.c | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index b536247a6d..d382e941e6 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -616,7 +616,9 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep)
      chosen_desc = ep->param1.description;
    else
      chosen_desc = ep->param2.description;
-      
+   if (!chosen_desc) chosen_desc = ep->param2.description;
+   if (!chosen_desc) return;
+   
    ep->chosen_description = chosen_desc;
    if (ep->param1.description)
      _edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc, ep->param1.rel1_to_x, ep->param1.rel1_to_y, ep->param1.rel2_to_x, ep->param1.rel2_to_y, ep->confine_to, &p1);
diff --git a/legacy/edje/src/lib/edje_program.c b/legacy/edje/src/lib/edje_program.c
index c3fbe04b2b..df181c3c53 100644
--- a/legacy/edje/src/lib/edje_program.c
+++ b/legacy/edje/src/lib/edje_program.c
@@ -577,8 +577,10 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force)
 	_edje_emit(ed, "program,stop", pr->name);
 	if (_edje_block_break(ed)) goto break_prog;
      }
-   if (!((pr->action == EDJE_ACTION_TYPE_STATE_SET) &&
-	 (pr->tween.time > 0.0) && (!ed->no_anim)))
+   if (!((pr->action == EDJE_ACTION_TYPE_STATE_SET) 
+	 /* hmm this fucks somethgin up. must look into it later */
+	 /* && (pr->tween.time > 0.0) && (!ed->no_anim))) */
+	 ))
      {
 	if (pr->after >= 0)
 	  {