Fixed crash when KeyboardFocusManager clears the focus

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / focus-manager / keyboard-focus-manager-impl.cpp

diff --git a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 7b1d929..193d985 100644 (file)
--- a/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/base/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -341,7 +341,10 @@ void KeyboardFocusManager::ClearFocus()
   Actor actor = GetCurrentFocusActor();
   if(actor)
   {
-    actor.Remove(mFocusIndicatorActor);
+    if(mFocusIndicatorActor)
+    {
+      actor.Remove(mFocusIndicatorActor);
+    }
 
     // Send notification for the change of focus actor
     if( !mFocusChangedSignalV2.Empty() )