Precautionary check for TV - for N_SE-44820

Change-Id: I44c1ca949e17b64e98f3be76226b19e4077017e7
Signed-off-by: Sreedeep Moulik <sreedeep.m@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
index 3140a33..fd6e23c 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewPresenter.cpp
@@ -134,7 +134,7 @@ _TableViewPresenter::Initialize(_TableView* pTableView)
        __pFastScrollTimer = new (std::nothrow) Timer();
        SysTryCatch(NID_UI_CTRL, __pFastScrollTimer != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory allocation failed.");
 
-        r = __pFastScrollTimer->Construct(*this);
+       r = __pFastScrollTimer->Construct(*this);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        return true;
@@ -155,12 +155,11 @@ result
 _TableViewPresenter::Construct(_TableView* pTableView)
 {
        result r = E_SUCCESS;
+       bool init = false;
 
        // Create Model
-       if (!Initialize(pTableView))
-       {
-               goto CATCH;
-       }
+       init = Initialize(pTableView);
+       SysTryCatch(NID_UI_CTRL, init == true, , r = GetLastResult(), "[%s] Propagating.", GetErrorMessage(GetLastResult()));
 
        return r;