--- 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