From af30d646c43c4e6822920d3c87a55e977b41783b Mon Sep 17 00:00:00 2001 From: "sriram.k" Date: Tue, 25 Jun 2013 13:37:44 +0530 Subject: [PATCH] Fix for TDIS-6363. Signed-off-by: sriram.k Change-Id: I099527ea36b840a2c4990d723b80a46c4c842887 --- src/ui/controls/FUiCtrl_ProgressPopup.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/ui/controls/FUiCtrl_ProgressPopup.cpp b/src/ui/controls/FUiCtrl_ProgressPopup.cpp index b0d9024..540b88c 100644 --- a/src/ui/controls/FUiCtrl_ProgressPopup.cpp +++ b/src/ui/controls/FUiCtrl_ProgressPopup.cpp @@ -562,20 +562,17 @@ result _ProgressPopup::UpdateBounds(void) { result r = E_SUCCESS; - + AppLog("Sriram:Entered"); // change the button bounds - __pButton->SetBounds(__pProgressPopupPresenter->GetButtonBounds()); + if (HasButton()) + { + __pButton->SetBounds(__pProgressPopupPresenter->GetButtonBounds()); + } // update total height -> GetTotalHeight (called by Impl) // update process-animation rect position -> GetAnimationRect (called by UpdateProcessAnimationVE) // update process-animation VE r = __pProgressPopupPresenter->UpdateProcessAnimation(); -// SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r)); - - return r; - -CATCH: - delete __pButton; - __pButton = null; + SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); return r; } -- 2.7.4