--- a/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp	Tue Apr 27 16:19:06 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp	Tue May 11 15:56:11 2010 +0300
@@ -341,8 +341,8 @@
 // ---------------------------------------------------------------------------
 //
 CCamCaptureSetupViewBase::CCamCaptureSetupViewBase( CCamAppController& aController )
-    : CCamViewBase( aController ),iForceAvkonCBA(EFalse),
-      iCaptureSetupModeActive( EFalse )
+    : CCamViewBase( aController ),
+      iForceAvkonCBA(EFalse)
     {
     }
 
@@ -1096,17 +1096,18 @@
     // We need to inform the AppUi
     iInfoListBoxActive = aActive;
 
-    CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() );
+    CCamAppUi* appUi = static_cast<CCamAppUi*>( AppUi() );
     
     if ( appUi)
         {
         if ( aActive )
             {
+            iPrevCaptureMode = appUi->PreCaptureMode();
             appUi->SetPreCaptureMode(ECamPreCapGenericSetting);
             }
         else
             {
-            appUi->SetPreCaptureMode(ECamPreCapViewfinder);
+            appUi->SetPreCaptureMode( iPrevCaptureMode );
             }        
         }
     }