From: Eunki, Hong <eunkiki.hong@samsung.com>
Date: Thu, 12 Dec 2024 08:40:10 +0000 (+0900)
Subject: [Tizen](Vector) Assert if callback was nullptr + Make trigger works well even if... 
X-Git-Tag: accepted/tizen/9.0/unified/20241216.142732~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cbb6d62851518e38952994e02fde361034a10a2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[Tizen](Vector) Assert if callback was nullptr + Make trigger works well even if callback was empty

Change-Id: I8f9218a0492fe67aeb9efd9f2ddfc75bddb2c529
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
---

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp
index 7fb77e6178..34576a7d99 100644
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.cpp
@@ -169,6 +169,10 @@ void VectorAnimationThread::AddEventTriggerCallback(CallbackBase* callback, uint
   Mutex::ScopedLock lock(mEventTriggerMutex);
   if(DALI_LIKELY(!mDestroyThread))
   {
+    DALI_LOG_DEBUG_INFO("VectorAnimationThread::AddEventTriggerCallback [%p, %u]\n", callback, argument);
+
+    DALI_ASSERT_ALWAYS(callback && "Someone register null callback! Please check the callstack\n");
+
     mTriggerEventCallbacks.emplace_back(callback, argument);
 
     if(!mEventTriggered)
@@ -469,6 +473,11 @@ std::pair<CallbackBase*, uint32_t> VectorAnimationThread::GetNextEventCallback()
       auto iter           = mTriggerEventCallbacks.begin();
       auto callbackIdPair = *iter;
       mTriggerEventCallbacks.erase(iter);
+      if(callbackIdPair.first == nullptr)
+      {
+        DALI_LOG_ERROR("Error! someone register null callback!\n");
+        mEventTriggered = false;
+      }
       return callbackIdPair;
     }
     mEventTriggered = false;