(Vector) Check if the object is valid

Change-Id: I472a3ad8967bfde5bc04fbdc62258fc71c224941

diff --git a/dali-extension/vector-animation-renderer/tizen-vector-animation-manager.cpp b/dali-extension/vector-animation-renderer/tizen-vector-animation-manager.cpp
index 37371aead2c9dddcf84d71c840bd350915cf2ba7..97668c8246d9773f2572d57576fe3f8854e06eea 100755 (executable)
--- a/dali-extension/vector-animation-renderer/tizen-vector-animation-manager.cpp
+++ b/dali-extension/vector-animation-renderer/tizen-vector-animation-manager.cpp
@@ -126,7 +126,12 @@ void TizenVectorAnimationManager::OnEventTriggered()
 
   for( auto&& iter : handlers )
   {
-    iter->NotifyEvent();
+    // Check if it is valid
+    auto handler = std::find( mEventHandlers.begin(), mEventHandlers.end(), iter );
+    if( handler != mEventHandlers.end() )
+    {
+      iter->NotifyEvent();
+    }
   }
 }
 

diff --git a/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp b/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp
index 1b0b3b2e98da5818471b0b54d3c6ab2fe874aaa8..f0ea5a671de5b30b61612fb6a395a3de2cc5e097 100755 (executable)
--- a/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp
+++ b/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp
@@ -120,6 +120,8 @@ void TizenVectorAnimationRenderer::Finalize()
 
   mTargetSurface = nullptr;
   mTbmQueue = NULL;
+
+  DALI_LOG_RELEASE_INFO( "TizenVectorAnimationRenderer::Finalize: [%p]\n", this );
 }
 
 void TizenVectorAnimationRenderer::SetRenderer( Renderer renderer )