--- a/camerauis/cameraapp/generic/src/CamStillPreCaptureContainer.cpp	Fri Mar 12 15:41:04 2010 +0200
+++ b/camerauis/cameraapp/generic/src/CamStillPreCaptureContainer.cpp	Mon Mar 15 12:39:00 2010 +0200
@@ -616,8 +616,16 @@
           }
         }
 #endif // __WINS__
-    }
-
+      }
+  else
+      {
+      // in case AF is not supported, check memory here before capturing
+      if ( !iController.IsViewFinding() || !appui->CheckMemoryL() )
+          {
+          return EKeyWasConsumed; 
+          }         
+      }
+      
   if( iXenonFlashSupported
    && !appui->IsSecondCameraEnabled()
    && !MSKCapture