Memory Leak fixed in Searchbar

Change-Id: I130320064a554b04a2a256348b7fea80d4f1a95d
Signed-off-by: Ayush <ayush.sriv@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_SearchBarImpl.cpp b/src/ui/controls/FUiCtrl_SearchBarImpl.cpp
index baeee13..9abfaf8 100644 (file)
--- 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)