--- a/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp	Tue May 11 15:56:11 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupContainer.cpp	Tue May 25 12:22:04 2010 +0300
@@ -399,7 +399,7 @@
          ( IsCaptureKeyL( aKeyEvent, aType ) || IsShutterKeyL( aKeyEvent, aType ) ) ) )  
         {
         TKeyResponse response = iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType );
-        if ( aType == EEventKeyDown && IsShutterKeyL( aKeyEvent, aType ) && 
+        if ( aType == EEventKeyDown && response == EKeyWasNotConsumed &&
             ( ECamSettingItemDynamicPhotoFlash == iControlHandler.SettingType() ||
             ECamSettingItemDynamicSelfTimer == iControlHandler.SettingType() ) )
             {
@@ -409,8 +409,7 @@
             {
             iView.HandleCommandL( EAknSoftkeyOk );
             }
-        
-        return response;
+        return EKeyWasConsumed;
         }
     return iCaptureSetupControl->OfferKeyEventL( aKeyEvent, aType );
     }
@@ -713,7 +712,6 @@
     switch( aEventType )
         {
         
-        case EEventEnterKeyPressed:
         case EEventItemDoubleClicked:
               {
               iView.HandleCommandL(EAknSoftkeyOk);