diff -r 289bbfdb6627 -r f54ad444594d camerauis/cameraapp/generic/src/CamStandbyContainer.cpp --- a/camerauis/cameraapp/generic/src/CamStandbyContainer.cpp Thu Jul 15 18:18:07 2010 +0300 +++ b/camerauis/cameraapp/generic/src/CamStandbyContainer.cpp Thu Aug 19 09:36:57 2010 +0300 @@ -201,7 +201,7 @@ !static_cast( iEikonEnv->AppUi() )->IsSecondCameraEnabled() ) || ( IsCaptureKeyL(aKeyEvent, aType)) ) { - // in case we receive an enter key or MSK key event in standby mode + // in case we receive MSK key event in standby mode // we should not call HandleCommandL function with ECamCmdExitStandby // because by default application will get a left softkey command id // when MSK is pressed. In standby mode left softkey command id is @@ -209,8 +209,7 @@ if ( !( ( aType == EEventKey || aType == EEventKeyDown || aType == EEventKeyUp ) && - ( aKeyEvent.iScanCode == EStdKeyDevice3 || - aKeyEvent.iScanCode == EStdKeyEnter ) ) ) + aKeyEvent.iScanCode == EStdKeyDevice3 ) ) { iView.HandleCommandL( ECamCmdExitStandby ); }