Set null focused control

Change-Id: I0ad089c5688d0fbfa200c3c0bf9ce4d650a074e0
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>

diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp
index ff6efa9..61050da 100755 (executable)
--- a/src/ui/FUi_Control.cpp
+++ b/src/ui/FUi_Control.cpp
@@ -1413,6 +1413,14 @@ _Control::CallOnDetachingFromMainTree(_Control& control)
        ControlList& children = control.GetChildList();\r
        _Control* pChild = null;\r
 \r
+       _Window* pTop = control.GetRootWindow();\r
+       if (pTop)\r
+       {\r
+               if ((&control) == pTop->GetFocusedControl())\r
+               {\r
+                       pTop->SetFocusedControl(null);\r
+               }\r
+       }\r
        if (!__isPostOrderTraversal)\r
        {\r
                r = control.GetControlDelegate().OnDetachingFromMainTree();\r
@@ -3665,15 +3673,6 @@ _Control::~_Control(void)
                __pFont = null;\r
        }\r
 \r
-       _Window* pTop = GetRootWindow();\r
-       if (pTop)\r
-       {\r
-               if (this == pTop->GetFocusedControl())\r
-               {\r
-                       pTop->SetFocusedControl(null);\r
-               }\r
-       }\r
-\r
 //     Dangerous: it clears last result and log in catch block.\r
 //     ClearLastResult();\r
 }\r