Scripting: Fix cut&paste typo

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / builder / builder-animations.cpp

diff --git a/dali-toolkit/internal/builder/builder-animations.cpp b/dali-toolkit/internal/builder/builder-animations.cpp
index 82a0669..4e26ad6 100644 (file)
--- 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;
 }