From ba18cfe7b908479e66baf71577769203e0356ff2 Mon Sep 17 00:00:00 2001 From: Choi Munseok Date: Tue, 9 Jul 2013 21:36:11 +0900 Subject: [PATCH] Fixed destroying the AppWidgetPopup Change-Id: Iec01ea2cb30af348d472fb868340df47aa3c4f9f Signed-off-by: Choi Munseok --- src/ui/FUi_Control.cpp | 8 +++++++- src/ui/FUi_Window.cpp | 5 ++++- src/ui/inc/FUi_Control.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp index 00804d6..636ace1 100644 --- a/src/ui/FUi_Control.cpp +++ b/src/ui/FUi_Control.cpp @@ -4807,10 +4807,16 @@ _Control::GetTouchInfoList(void) return __pDelayedTouchInfoList; } +void +_Control::SetVisualElement(_ControlVisualElement* pVisualElement) +{ + __pVisualElement = pVisualElement; +} + _VisualElement* _Control::GetVisualElement(void) const { - SysAssert(__pVisualElement); + //SysAssert(__pVisualElement); return __pVisualElement; } diff --git a/src/ui/FUi_Window.cpp b/src/ui/FUi_Window.cpp index c5528f3..d314ca1 100644 --- a/src/ui/FUi_Window.cpp +++ b/src/ui/FUi_Window.cpp @@ -96,7 +96,10 @@ _Window::~_Window(void) if(__pRootVisualElement) { - __pRootVisualElement->DetachChild(*GetVisualElement()); + if (GetVisualElement()) + { + __pRootVisualElement->DetachChild(*GetVisualElement()); + } } delete __pLayer; __pLayer = NULL; diff --git a/src/ui/inc/FUi_Control.h b/src/ui/inc/FUi_Control.h index 19a7c1f..67fc760 100644 --- a/src/ui/inc/FUi_Control.h +++ b/src/ui/inc/FUi_Control.h @@ -568,6 +568,7 @@ public: _IPropagatedKeyEventListener* GetPropagatedKeyEventListener(void) const; // Visual element: Do not use visual element directly. + void SetVisualElement(Animations::_ControlVisualElement* pVisualElement); Animations::_VisualElement* GetVisualElement(void) const; void PrintDescription(bool printChildren, int level); -- 2.7.4