Peter M. Groen / dali-demo

Commit 21103a757c13e90d72ea7f67862982c2355d374e

Authored by Daniel McEwen
2 parents b00a255c b1a9dcaa

[dali_1.4.10] Merge branch 'devel/master' 

Change-Id: Ic91180f8796b82fca6b65e7ded630fab16d8d490
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
examples/layouting/animation-example.cpp
  View file @21103a7
@@ -461,7 +461,7 @@ bool AnimationExample::OnRemoveClicked( Button button ) @@ -461,7 +461,7 @@ bool AnimationExample::OnRemoveClicked( Button button )
461 { 461 {
462 DALI_LOG_INFO( gLayoutFilter, Debug::Verbose, "AnimationExample::OnRemoveClicked\n"); 462 DALI_LOG_INFO( gLayoutFilter, Debug::Verbose, "AnimationExample::OnRemoveClicked\n");
463 463
464 - if ( mAnimationContainer.GetChildCount() > 1 ) 464 + if ( mAnimationContainer.GetChildCount() > 0 )
465 { 465 {
466 mAnimationContainer.Remove( mAnimationContainer.GetChildAt( mAnimationContainer.GetChildCount() - 1 ) ); 466 mAnimationContainer.Remove( mAnimationContainer.GetChildAt( mAnimationContainer.GetChildCount() - 1 ) );
467 } 467 }
packaging/com.samsung.dali-demo.spec
  View file @21103a7
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.4.9 5 +Version: 1.4.10
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0