--- a/harvester/monitorplugins/mmcplugin/src/mmcfilelist.cpp	Tue Jan 26 12:13:20 2010 +0200
+++ b/harvester/monitorplugins/mmcplugin/src/mmcfilelist.cpp	Tue Feb 02 00:24:33 2010 +0200
@@ -87,7 +87,7 @@
 		RPointerArray<CPlaceholderData>& aEntryArray )
 	{
 	WRITELOG( "CMmcFileList::BuildFileListL - start" );
-	CDesCArrayFlat* path = new(ELeave) CDesCArrayFlat( 8 );
+	CDesCArrayFlat* path = new(ELeave) CDesCArrayFlat( 10 );
 	CleanupStack::PushL( path );
 	TFileName firstPath;
 	firstPath.Copy( aDrivePath );
@@ -191,14 +191,11 @@
 	WRITELOG( "CMmcFileList::HandleFileEntryL()" );
 	
 	// calculate batch size
-	TInt batchSize( 0 );
-	if ( aEntryArray.Count() >= KEntryBufferSize )
+	TInt batchSize( KEntryBufferSize );
+	const TInt count( aEntryArray.Count() );
+	if ( count < KEntryBufferSize )
 		{
-		batchSize = KEntryBufferSize;
-		}
-	else
-		{
-		batchSize = aEntryArray.Count();
+		batchSize = count;
 		}
 
 #ifdef _DEBUG