diff -r b6d70b04aa2d -r a297cbce4e85 multimediacommscontroller/mmcccontroller/src/mcccamerahandler.cpp --- a/multimediacommscontroller/mmcccontroller/src/mcccamerahandler.cpp Fri May 14 15:11:40 2010 +0300 +++ b/multimediacommscontroller/mmcccontroller/src/mcccamerahandler.cpp Fri May 28 16:08:43 2010 +0300 @@ -150,6 +150,10 @@ iViewFinderSettings = aSetting; + if ( !iViewFinderSettings.iEnabled ){ + __CONTROLLER( "CMccCameraHandler::EnableViewFinderL, param update, exit" ) + return; + } __CONTROLLER( "CMccCameraHandler::EnableViewFinderL, starting vf" ) CCamera* cam = IsCameraReady() ? iCamera : NULL; @@ -217,8 +221,9 @@ iViewFinderSettings.iSize.iWidth) __CONTROLLER_INT2( "CMccCameraHandler::GetViewFinderSettingsL, location", iViewFinderSettings.iLocation.iX, - iViewFinderSettings.iLocation.iY) - aSetting = iViewFinderSettings; + iViewFinderSettings.iLocation.iY) + aSetting = iViewFinderSettings; + aSetting.iEnabled = iViewFinderEnabled; __CONTROLLER( "CMccCameraHandler::GetViewFinderSettingsL,exit" ) }