From: Jaewon Cho <jaewon7.cho@samsung.com>
Date: Wed, 4 Sep 2013 02:43:41 +0000 (+0900)
Subject: Fix the OnInitializing() method defect (DCM-2399) - Doesn't cancel adding the control... 
X-Git-Tag: accepted/tizen/20131002.165803^2~230
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1ca4bd73df22d2a34b5928f831f8b2dd2f8141e;p=platform%2Fframework%2Fnative%2Fuifw.git

Fix the OnInitializing() method defect (DCM-2399) - Doesn't cancel adding the control to the parent when return exception

Change-Id: Ie5889626470c6ac6061dbd6f86daa35117a0edd2
Signed-off-by: Jaewon Cho <jaewon7.cho@samsung.com>
---

diff --git a/src/ui/controls/FUiCtrl_FormImpl.cpp b/src/ui/controls/FUiCtrl_FormImpl.cpp
index da0e3fd..30cef62 100644
--- a/src/ui/controls/FUiCtrl_FormImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FormImpl.cpp
@@ -1545,7 +1545,10 @@ _FormImpl::OnAttachedToMainTree(void)
   SetFocused();
 
   r = GetCore().AttachedToMainTree();
+  SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+
   r = _ContainerImpl::OnAttachedToMainTree();
+  SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
 	FloatRectangle indicatorBounds(0.0f, 0.0f, 0.0f, 0.0f);