Return null for Control::GetControlAnimator() if it's Window instance

Change-Id: I0d7ed0d90cf32b9b258b3357610485883dc40b45
Signed-off-by: Jaewon Cho <jaewon7.cho@samsung.com>

diff --git a/src/ui/FUi_ControlImpl.cpp b/src/ui/FUi_ControlImpl.cpp
index 7eb6ff5..2e582d6 100644 (file)
--- a/src/ui/FUi_ControlImpl.cpp
+++ b/src/ui/FUi_ControlImpl.cpp
@@ -4324,7 +4324,14 @@ _ControlImpl::GetControlAnimator(void) const
 
        if ((IsMovable() == false) && (IsResizable() == false))
        {
-               SysLog(NID_UI, "Control is not animatable.\n");
+               SysLog(NID_UI, "Control is not animatable.");
+               return null;
+       }
+
+       const _WindowImpl* pWindowImpl = dynamic_cast <const _WindowImpl*>(this);
+       if (pWindowImpl != null)
+       {
+               SysLog(NID_UI, "Window is not animatable.");
                return null;
        }