--- a/camerauis/cameraapp/generic/src/CamAppui.cpp	Tue Sep 14 20:46:07 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamAppui.cpp	Wed Sep 15 11:51:19 2010 +0300
@@ -3894,6 +3894,7 @@
         CleanupStack::PushL( plugin );
         AddViewL( plugin ); // Transfer ownership to AppUi
         CleanupStack::Pop( plugin );
+        iController.SetSettingsPlugin( plugin->iDtor_ID_Key );
         iPlugin = plugin;        
         }
       break;
@@ -4627,8 +4628,8 @@
     			"e_CCamAppUi_CheckMemoryL 1" );
     PRINT( _L("Camera => CCamAppUi::CheckMemoryL") );
     TBool capture = ETrue;
-
-    if ( IsMemoryAvailableForCapturing() )
+    if ( ( ECamControllerImage == iController.CurrentMode() ) &&  
+            IsMemoryAvailableForCapturing() )
         {
         capture = ETrue; 
         }