NABI issue 43690

Change-Id: I91c5bb4dd471951c44f34e9ea004bc6496e14dc7

diff --git a/inc/CmCameraPresentationModel.h b/inc/CmCameraPresentationModel.h
index 65088b5..fcd8260 100644 (file)
--- a/inc/CmCameraPresentationModel.h
+++ b/inc/CmCameraPresentationModel.h
@@ -153,7 +153,7 @@ public:
        void SetZoomValue(int zoomValue);
        Tizen::Media::CameraFlashMode GetFlashMode(void) const;
        result SetFlashModeOnRecord(bool flashOn);
-       void SetFlashMode(Tizen::Media::CameraFlashMode mode);
+       result SetFlashMode(Tizen::Media::CameraFlashMode mode);
        Tizen::Ui::OrientationStatus GetOrientation(void) const;
        void SetOrientation(Tizen::Ui::OrientationStatus dir);
        int GetAppControlRequestType(void) const;

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index a5e94a6..16aba6c 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -5761,6 +5761,9 @@ CamcorderForm::ProcessFlashListPopup(int index)
                }
        }
 
+       r = _pCameraPresentationModel->SetFlashMode(cameraFlashMode);
+       TryCatch(r == E_SUCCESS, , "SetFlash fail[%s]", GetErrorMessage(r));
+
        r = _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
@@ -5790,8 +5793,6 @@ CamcorderForm::ProcessFlashListPopup(int index)
        SetCamcorderTabSettingMainMenuCount(MENU_COUNT_CLEAR);
        SetCamcorderTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMCORDER_SUB_MENU_CONTENT_MAX);
 
-       _pCameraPresentationModel->SetFlashMode(cameraFlashMode);
-
        AppLogDebug("EXIT");
        return r;
 

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index 93460b3..ce2da3b 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -5635,8 +5635,10 @@ CameraForm::ProcessFlashListPopup(int index)
                }
        }       
        
-               _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
-       
+       r = _pCameraPresentationModel->SetFlashMode(CameraFlashMode(index));
+       TryCatch(r == E_SUCCESS, , "SetFlash fail[%s]", GetErrorMessage(r));
+
+       _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
 
        TryCatch(__pSettingPanel != null, r = E_SYSTEM, "__pSettingPanel is null");
 
@@ -5665,12 +5667,13 @@ CameraForm::ProcessFlashListPopup(int index)
        SetCameraTabSettingMainMenuCount(MENU_COUNT_CLEAR);
        SetCameraTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMERA_TAB_SUB_MENU_CONTENT_MAX);
 
-       _pCameraPresentationModel->SetFlashMode(cameraFlashMode);
+
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
 
 CATCH:
+AppLogDebug("Catch:");
        return r;
 }
 

diff --git a/src/CmCameraPresentationModel.cpp b/src/CmCameraPresentationModel.cpp
index d1a008b..5e7dd11 100644 (file)
--- a/src/CmCameraPresentationModel.cpp
+++ b/src/CmCameraPresentationModel.cpp
@@ -2956,7 +2956,7 @@ CATCH:
        return ret;
 }
 
-void
+result
 CameraPresentationModel::SetFlashMode(CameraFlashMode mode)
 {
        AppLogDebug("ENTER");
@@ -2979,13 +2979,14 @@ CameraPresentationModel::SetFlashMode(CameraFlashMode mode)
                        r = __pCamera->SetFlashMode(mode);
                        AppLogDebug("Set SetFlashMode = %s", GetErrorMessage(r));
                }
-               TryReturnVoid(r == E_SUCCESS, "SetFlashMode() fail[%s]", GetErrorMessage(r));
        }
        else
        {
                AppLogDebug("__pCamera is null");
+               r = E_FAILURE;
        }
        AppLogDebug("EXIT");
+       return r;
 }
 
 Tizen::Ui::OrientationStatus