# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1279207087 -10800
# Node ID 289bbfdb66274941293b22ed3784d13b808f9f5c
# Parent  e32fcfe0045f2b02b206009695bd299c62ddd544
Revision: 201025
Kit: 2010127

diff -r e32fcfe0045f -r 289bbfdb6627 camerauis/cameraapp/generic/common/src/CamCaptureSetupListBox.cpp
--- a/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBox.cpp	Mon Jun 21 15:19:37 2010 +0300
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBox.cpp	Thu Jul 15 18:18:07 2010 +0300
@@ -148,7 +148,7 @@
     else
         {
         PRINT( _L("Camera <= CCamCaptureSetupListBox::OfferKeyEventL EKeyWasConsumed" ))
-        response = EKeyWasConsumed;
+        response = EKeyWasNotConsumed;
         }
     
     PRINT( _L("Camera <= CCamCaptureSetupListBox::OfferKeyEventL" ))
diff -r e32fcfe0045f -r 289bbfdb6627 camerauis/cameraapp/generic/src/CamAppController.cpp
--- a/camerauis/cameraapp/generic/src/CamAppController.cpp	Mon Jun 21 15:19:37 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamAppController.cpp	Thu Jul 15 18:18:07 2010 +0300
@@ -2555,6 +2555,13 @@
   SetCameraSwitchRequired( ESwitchDone );  
   CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() );
   iCameraController->SwitchCameraL( (ECamActiveCameraPrimary == targetCamera) ? 0 : 1 );
+  if( UiConfigManagerPtr()->IsUIOrientationOverrideSupported() )
+      {
+      RArray<TInt> screenModeValues;
+      UiConfigManagerPtr()->SupportedScreenModesL( screenModeValues );
+      TInt landscapeScreenMode = screenModeValues[0];
+      SetCameraOrientationModeL( landscapeScreenMode );
+      }
   iCameraController->CompleteSwitchCameraL();
 
   // Camera switched.
@@ -9245,6 +9252,18 @@
             // sequence canceled, no need to event further
             return;
             }
+        else if( aStatus == KErrNone )
+            {
+            //Reset standbystatus. Needed if recovered from error.
+            if( IsAppUiAvailable() ) 
+              {
+              if ( !InVideocallOrRinging() )
+                  {
+                  CCamAppUi* appUi = static_cast<CCamAppUi*>( CEikonEnv::Static()->AppUi() ); 
+                  appUi->SetStandbyStatus( aStatus );               
+                  }
+              } 
+            }
       break;
       }
     //Image capture event  
diff -r e32fcfe0045f -r 289bbfdb6627 camerauis/cameraapp/generic/src/CamAppui.cpp
--- a/camerauis/cameraapp/generic/src/CamAppui.cpp	Mon Jun 21 15:19:37 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamAppui.cpp	Thu Jul 15 18:18:07 2010 +0300
@@ -1558,6 +1558,7 @@
     // -----------------------------------------------------
     case ECamCmdPhotos:
       { 
+      iController.ReleaseCamera();  
       TUid msgUidLastModified(TUid::Uid(KGlxActivationCmdShowLastModified));
       TUid msgUidCameraAlbum(TUid::Uid(KGlxActivationCameraAlbum));
       TApaTaskList apaTaskList( CCoeEnv::Static()->WsSession() );
@@ -3445,7 +3446,8 @@
                ECamPreCapViewfinder == iPreCaptureMode && 
                ( !( iSelfTimer && iSelfTimer->IsActive() ) ) &&
                iController.CurrentOperation() != ECamCapturing &&
-               iController.CurrentOperation() != ECamPaused )
+               iController.CurrentOperation() != ECamPaused &&
+               !iReturningFromPretendExit )
             {
             SetToolbarVisibility(); 
             }          
diff -r e32fcfe0045f -r 289bbfdb6627 camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp
--- a/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp	Mon Jun 21 15:19:37 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamUserSceneSetupContainer.cpp	Thu Jul 15 18:18:07 2010 +0300
@@ -465,7 +465,7 @@
         }
     else
         {
-        return EKeyWasConsumed;    
+        return EKeyWasNotConsumed;    
         }
     }