diff -r f0c0788c4de2 -r 756ad29ed18e camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp --- a/camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp Wed Sep 15 11:51:19 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamPreCaptureViewBase.cpp Wed Oct 13 14:09:54 2010 +0300 @@ -558,7 +558,7 @@ ( iController.CurrentOperation() != ECamCapturing && iController.CurrentOperation() != ECamPaused ) ); TBool precaptureToolbarState = !appUi->IsBurstEnabled() - && !iStandbyModeActive && !appUi->IsInPretendExit() && !iController.IsKeyLockOn(); + && !iStandbyModeActive && !appUi->IsInPretendExit(); if ( ( ECamCameraPreparedImage == iController.CameraState() || showVideoModeToolbar ) && @@ -1877,8 +1877,7 @@ } else if ( EAknTouchGestureFwDoubleTap == aEvent.Type() && ( ECamNoOperation == iController.CurrentOperation() - || ( ( ECamCapturing == iController.CurrentOperation() - || ECamPaused == iController.CurrentOperation() ) + || ( ECamCapturing == iController.CurrentOperation() && iController.CurrentMode() == ECamControllerVideo ) ) ) { PRINT( _L("Camera <> double tap event") );