From: Seoyeon Kim Date: Tue, 12 Mar 2019 05:30:13 +0000 (+0900) Subject: Merge branch 'devel/master' into tizen X-Git-Tag: submit/tizen/20190312.064145 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Fsubmit%2Ftizen%2F20190312.064145;hp=064b6af7d74f26720237b1fe43620681665a3ac6;p=platform%2Fcore%2Fuifw%2Fdali-demo.git Merge branch 'devel/master' into tizen Change-Id: I3ca0c8bf3e3293c30cc3a73df06fe798ae2bdc65 --- diff --git a/examples/layouting/animation-example.cpp b/examples/layouting/animation-example.cpp index 3b2c0a9..09fa121 100644 --- a/examples/layouting/animation-example.cpp +++ b/examples/layouting/animation-example.cpp @@ -461,7 +461,7 @@ bool AnimationExample::OnRemoveClicked( Button button ) { DALI_LOG_INFO( gLayoutFilter, Debug::Verbose, "AnimationExample::OnRemoveClicked\n"); - if ( mAnimationContainer.GetChildCount() > 1 ) + if ( mAnimationContainer.GetChildCount() > 0 ) { mAnimationContainer.Remove( mAnimationContainer.GetChildAt( mAnimationContainer.GetChildCount() - 1 ) ); } diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 3fa45a1..682f0ed 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -2,7 +2,7 @@ Name: com.samsung.dali-demo Summary: The OpenGLES Canvas Core Demo -Version: 1.4.8 +Version: 1.4.10 Release: 1 Group: System/Libraries License: Apache-2.0