From da1a9cedfd527d60739f67ad38ffd7dcee9b2ce1 Mon Sep 17 00:00:00 2001 From: vipul Date: Fri, 28 Jun 2013 19:10:32 +0530 Subject: [PATCH] submenu crash fix in optionmenu Signed-off-by: vipul Change-Id: I0334e2aa702277b4411f6ca1d0def333e2ed27d8 --- src/ui/controls/FUiCtrl_ContextMenuItem.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ui/controls/FUiCtrl_ContextMenuItem.cpp b/src/ui/controls/FUiCtrl_ContextMenuItem.cpp index d8a18a4..e9f9a86 100644 --- a/src/ui/controls/FUiCtrl_ContextMenuItem.cpp +++ b/src/ui/controls/FUiCtrl_ContextMenuItem.cpp @@ -124,6 +124,20 @@ _ContextMenuItem::~_ContextMenuItem(void) __pLowerDividerLineLabel = null; } + if (__pTextLabel != null) + { + DetachChild(*__pTextLabel); + delete __pTextLabel; + __pTextLabel = null; + } + + if (__pBitmapLabel != null) + { + DetachChild(*__pBitmapLabel); + delete __pBitmapLabel; + __pBitmapLabel = null; + } + _AccessibilityContainer* pContainer = GetAccessibilityContainer(); if (pContainer) { -- 2.7.4