diff -r 0e652f8f1fbd -r 24fd82631616 camerauis/cameraxui/cxui/src/cxuiselftimer.cpp --- a/camerauis/cameraxui/cxui/src/cxuiselftimer.cpp Thu Jul 15 01:55:05 2010 +0300 +++ b/camerauis/cameraxui/cxui/src/cxuiselftimer.cpp Fri Jul 23 11:35:41 2010 +0300 @@ -29,6 +29,7 @@ #include "cxesettings.h" #include "cxenamespace.h" // CxeSettingIds #include "cxeerror.h" +#include "cxeexception.h" using namespace CxUiLayout; @@ -272,12 +273,11 @@ CX_DEBUG_ENTER_FUNCTION(); // get the current postcapture timeout - CxeError::Id error = mSettings.get(CxeSettingIds::STILL_SHOWCAPTURED, mOldPostCaptureTimeOut); - - if (error == CxeError::None) { + try { + mOldPostCaptureTimeOut = mSettings.get(CxeSettingIds::STILL_SHOWCAPTURED); // set continuous postcapture (view is visible until dismissed) mSettings.set(CxeSettingIds::STILL_SHOWCAPTURED, CONTINUOUS_POSTCAPTURE); - } else { + } catch (CxeException &e) { // if there was an error, don't modify the postcapture setting mOldPostCaptureTimeOut = UNKNOWN; }