From 33bc04a7c562965f88974e91f21bb74595f0aeaa Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Thu, 27 Jan 2022 15:44:28 +0900 Subject: [PATCH] Add null check for currentFocusActor Integration::SceneHolder::Get(currentFocusActor); it crashes if currentFocusActor is null. Change-Id: Ia3d5f2e47060bd33ee691ebf36b5e0504b1a4a7d --- dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.7.4