From: Lee Morgan <Lee.morgan@partner.samsung.com>
Date: Tue, 15 Apr 2014 13:51:00 +0000 (+0100)
Subject: Fix builder animation
X-Git-Tag: dali-2014-wk16-release~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c557e23fe8472c6adb657e41c33664b1fbf43d6e;ds=inline

Fix builder animation

[Issue#]   N/A
[Problem]  Crash with no animation duration from json
[Cause]    Bug in change to support animations where properties have no time-period
[Solution] N/A.

Change-Id: Icf685250e7bf529a0c0ff1751a2f24e7f7aca4fd
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
---

diff --git a/dali-toolkit/internal/builder/builder-animations.cpp b/dali-toolkit/internal/builder/builder-animations.cpp
index 82a0669..4e26ad6 100644
--- a/dali-toolkit/internal/builder/builder-animations.cpp
+++ b/dali-toolkit/internal/builder/builder-animations.cpp
@@ -164,10 +164,6 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
   {
     animation.SetDuration( *duration );
   }
-  else
-  {
-    animation.SetDuration( durationSum );
-  }
 
   if( OptionalBoolean looping = constant.IsBoolean(  IsChild(child, "loop" ) ) )
   {
@@ -354,6 +350,11 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
     }
   }
 
+  if( !duration )
+  {
+    animation.SetDuration( durationSum );
+  }
+
   return animation;
 }