--- 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(); 
             }