From c81563c89032657072159d733d8c54463779daa7 Mon Sep 17 00:00:00 2001
From: Ayush <ayush.sriv@samsung.com>
Date: Wed, 10 Jul 2013 17:38:44 +0530
Subject: [PATCH] Memory Leak fixed in Searchbar

Change-Id: I130320064a554b04a2a256348b7fea80d4f1a95d
Signed-off-by: Ayush <ayush.sriv@samsung.com>
---
 src/ui/controls/FUiCtrl_SearchBarImpl.cpp | 38 ++++++++++++++++---------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/ui/controls/FUiCtrl_SearchBarImpl.cpp b/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
index baeee13..9abfaf8 100644
--- a/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
+++ b/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
@@ -69,6 +69,23 @@ _SearchBarImpl::~_SearchBarImpl(void)
 	if (__pSearchBar)
 	{
 		SetContent(null);
+		if (__pSearchBar->GetClippedGroupControl())
+		{
+			_Control* pControl = __pSearchBar->GetClippedGroupControl();
+			pControl->DetachAllChildren();
+		}
+	}
+
+	if (__pEditField)
+	{
+		delete __pEditField;
+		__pEditField = null;
+	}
+
+	if (__pButton)
+	{
+		delete __pButton;
+		__pButton = null;
 	}
 
 	if (__pPublicActionEvent)
@@ -101,25 +118,10 @@ _SearchBarImpl::~_SearchBarImpl(void)
 		__pPublicSearchBarEvent = null;
 	}
 
-	if (__pSearchBar)
-	{
-		if (__pSearchBar->GetClippedGroupControl())
-		{
-			_Control* pControl = __pSearchBar->GetClippedGroupControl();
-			pControl->DetachAllChildren();
-		}
-	}
-
-	if (__pEditField)
-	{
-		delete __pEditField;
-		__pEditField = null;
-	}
-
-	if (__pButton)
+	if (__pPublicLanguageEvent)
 	{
-		delete __pButton;
-		__pButton = null;
+		delete __pPublicLanguageEvent;
+		__pPublicLanguageEvent = null;
 	}
 
 	if (__pPublicFocusEventListeners)
-- 
2.7.4