From: joogab.yun <joogab.yun@samsung.com>
Date: Thu, 27 Jan 2022 06:44:28 +0000 (+0900)
Subject: [Tizen] Add null check for currentFocusActor
X-Git-Tag: accepted/tizen/6.5/unified/20220218.152712~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=4c09046ecb0b856cc2f2300f9aa5709d44dc8d1b

[Tizen] Add null check for currentFocusActor

 Integration::SceneHolder::Get(currentFocusActor);
it crashes if currentFocusActor is null.

Change-Id: Ia3d5f2e47060bd33ee691ebf36b5e0504b1a4a7d
---

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 8c737d2..b8b8a6d 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -514,7 +514,7 @@ bool KeyboardFocusManager::MoveFocus(Toolkit::Control::KeyboardFocus::Direction
         nextFocusableActor                  = mPreFocusChangeSignal.Emit(currentFocusActor, Actor(), direction);
         mIsWaitingKeyboardFocusChangeCommit = false;
       }
-      else if(mEnableDefaultAlgorithm)
+      else if(mEnableDefaultAlgorithm && currentFocusActor)
       {
         // We should find it among the actors nearby.
         Integration::SceneHolder window = Integration::SceneHolder::Get(currentFocusActor);