--- a/harvesterplugins/file/src/cmmcmonitor.cpp Wed Aug 18 09:49:49 2010 +0300
+++ b/harvesterplugins/file/src/cmmcmonitor.cpp Thu Sep 02 20:27:46 2010 +0300
@@ -133,34 +133,7 @@
{
OstTraceFunctionEntry0( CMMCMONITOR_STARTMONITORING_ENTRY );
CPIXLOGSTRING("ENTER CMMCMonitor::StartMonitoring");
- iProperty.Subscribe( iStatus );
- SetActive();
- User::LeaveIfError( iProperty.Get( KPSUidUikon, KUikMMCInserted, iMmcStatus ) );
-
- for ( TInt driveNumber = EDriveA; driveNumber <= EDriveZ; driveNumber++ )
- {
- const TBool foundMmc = MmcStatus( driveNumber );
- if ( !foundMmc )
- {
- continue;
- }
-
- // This drive has been recognized as MMC.
- TDriveNumber drv = TDriveNumber( driveNumber );
-
- TUint drvStatus( 0 );
-
- const TInt err = DriveInfo::GetDriveStatus( *iFsSession, driveNumber, drvStatus );
- if ( err )
- {
- continue; // should not happen
- }
-
- if ( drvStatus & DriveInfo::EDrivePresent )
- {
- iFilePlugin.MountL(drv, EFalse);
- }
- }
+ TRAP_IGNORE( RunL() );//Need to TRAP this rather than use RunError
CPIXLOGSTRING("END CMMCMonitor::StartMonitoring");
OstTraceFunctionExit0( CMMCMONITOR_STARTMONITORING_EXIT );
return ETrue;
@@ -269,7 +242,7 @@
OstTrace0( TRACE_NORMAL, DUP2_CMMCMONITOR_RUNL, "CMMCMonitor::RunL insert event" );
CPIXLOGSTRING("CMMCMonitor::RunL insert event");
// Mount MMC and force reharvest
- iFilePlugin.MountL(drv, ETrue);
+ iFilePlugin.MountL(drv, EFalse);//dont force reharvest
}
else
{