From: jaewon7.cho <jaewon7.cho@samsung.com>
Date: Tue, 2 Apr 2013 10:33:06 +0000 (+0900)
Subject: Fix E_OUT_OF_RANGE  exception in Container::RemoveControl function
X-Git-Tag: accepted/tizen_2.1/20130425.033138~526
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92125bf5f1e50a67f312729ee8e588943b5472b4;p=framework%2Fosp%2Fuifw.git

Fix E_OUT_OF_RANGE  exception in Container::RemoveControl function

Change-Id: Iacc169ec5e1bd93bcfe691d83110a8967566cf3c
Signed-off-by: jaewon7.cho <jaewon7.cho@samsung.com>
---

diff --git a/src/ui/FUi_ContainerImpl.cpp b/src/ui/FUi_ContainerImpl.cpp
index 6e5a9b2..6871ed1 100755
--- a/src/ui/FUi_ContainerImpl.cpp
+++ b/src/ui/FUi_ContainerImpl.cpp
@@ -291,8 +291,11 @@ _ContainerImpl::RemoveControl(int index)
 		delete pContainer;
 		pContainer = null;
 	}
-	r = RemoveChild(index);
-	SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+	else
+	{
+		r = RemoveChild(index);
+		SysTryReturn(NID_UI, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+	}
 
 	return r;
 }