Rollback - GetOwner() returns wrong pointer in OnOwnerChanged() callback

Change-Id: I52b0ada57387ffa32a3150d4a86aa41e65830f93
Signed-off-by: jaewon7.cho <jaewon7.cho@samsung.com>

diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp
index cdbb602..91078e4 100644 (file)
--- a/src/ui/FUi_Window.cpp
+++ b/src/ui/FUi_Window.cpp
@@ -252,9 +252,8 @@ _Window::SetOwner(_Control* pOwner)
                pOwner->AttachOwnee(*this);
        }
 
-       _Control* pOldOwner = __pOwner;
+       GetWindowDelegate().OnOwnerChanged(__pOwner);
        __pOwner = pOwner;
-       GetWindowDelegate().OnOwnerChanged(pOldOwner);
 }
 
 result