diff -r 6c1dfe4da5dd -r 63223d4fd956 mmappcomponents/harvester/filehandler/src/mpxharvesterfilehandlerimp.cpp
--- a/mmappcomponents/harvester/filehandler/src/mpxharvesterfilehandlerimp.cpp	Tue Aug 31 15:41:40 2010 +0300
+++ b/mmappcomponents/harvester/filehandler/src/mpxharvesterfilehandlerimp.cpp	Wed Sep 01 12:23:05 2010 +0100
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  Handles all file related activities
-*  Version     : %version: da1mmcf#72.1.14.2.4.1.4.1.2.5.4 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: da1mmcf#72.1.14.2.4.1.4.1.2.1.9 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -343,12 +343,11 @@
                 // Remove current drive from the scanned drives list
                 TParse fileNameParser;
                 User::LeaveIfError(fileNameParser.Set(iFilteredDrivesToScan[index],NULL,NULL));
-                TFileName driveName(fileNameParser.Drive());
+                TPtrC driveName(fileNameParser.Drive());
                 TInt driveNumber = TDriveUnit( driveName );
                 if (currentDriveNumber == driveNumber)
                     {
                     iFilteredDrivesToScan.Remove(index);
-                    iFilteredOutOfDisk = ETrue;
                     count--;
                     }
                 else
@@ -357,6 +356,7 @@
                     }
                 }
             iDBManager->CloseDatabase(static_cast<TDriveNumber>(currentDriveNumber));
+            iFilteredOutOfDisk = ETrue;
             }
         }