From: sr.shashank <sr.shashank@samsung.com>
Date: Wed, 8 May 2013 10:10:11 +0000 (+0530)
Subject: Fix for TDIS-5633.[Removal of Parent Controls attached to Splitpanel Panes in Destruc... 
X-Git-Tag: submit/tizen_2.1/20130514.054411~40^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bd39778686ad7ae9cae597771d5caab9c9e5599;p=framework%2Fosp%2Fuifw.git

Fix for TDIS-5633.[Removal of Parent Controls attached to Splitpanel Panes in Destructor].

Change-Id: Ia2e29cd796711363b6fc3f0611f30b2e639acbd8
Signed-off-by: sr.shashank <sr.shashank@samsung.com>
---

diff --git a/src/ui/controls/FUiCtrl_SplitPanel.cpp b/src/ui/controls/FUiCtrl_SplitPanel.cpp
index 48b5675..0b381bc 100644
--- a/src/ui/controls/FUiCtrl_SplitPanel.cpp
+++ b/src/ui/controls/FUiCtrl_SplitPanel.cpp
@@ -189,11 +189,6 @@ CATCH:
 
 	if (__pFirstPaneParent)
 	{
-		if (__pFirstPane)
-		{
-			__pFirstPaneParent->DetachChild(*__pFirstPane);
-		}
-
 		DetachChild(*__pFirstPaneParent);
 
 		delete __pFirstPaneParent;
@@ -202,11 +197,6 @@ CATCH:
 
 	if (__pSecondPaneParent)
 	{
-		if (__pSecondPane)
-		{
-			__pSecondPaneParent->DetachChild(*__pSecondPane);
-		}
-
 		DetachChild(*__pSecondPaneParent);
 
 		delete __pSecondPaneParent;
@@ -253,6 +243,22 @@ _SplitPanel::~_SplitPanel(void)
 		__pDividerVisualElement = null;
 	}
 
+	if (__pFirstPaneParent)
+	{
+		DetachChild(*__pFirstPaneParent);
+
+		delete __pFirstPaneParent;
+		__pFirstPaneParent = null;
+	}
+
+	if (__pSecondPaneParent)
+	{
+		DetachChild(*__pSecondPaneParent);
+
+		delete __pSecondPaneParent;
+		__pSecondPaneParent = null;
+	}
+
 	ClearLastResult();
 }