diff -r a05c44bc3c61 -r d881023c13eb mmappcomponents/harvester/server/src/mpxusbeventhandler.cpp --- a/mmappcomponents/harvester/server/src/mpxusbeventhandler.cpp Fri Apr 16 15:28:14 2010 +0300 +++ b/mmappcomponents/harvester/server/src/mpxusbeventhandler.cpp Mon May 03 12:58:40 2010 +0300 @@ -41,7 +41,6 @@ CActive( EPriorityStandard ), iWasMtp ( EFalse ), iObserver( aObserver ), - iMTPActive ( EFalse ), iUsbManConnected( EFalse ) { CActiveScheduler::Add( this ); @@ -175,7 +174,6 @@ { MPX_DEBUG1("CMPXUsbEventHandler::DoHandlePSEvent - MTP End"); iObserver.HandleSystemEventL( EUSBMTPEndEvent, removableDrive ); - iMTPActive = EFalse; } MPX_DEBUG1("CMPXUsbEventHandler::DoHandlePSEvent - USB Start"); #ifdef RD_MULTIPLE_DRIVE @@ -199,20 +197,15 @@ if (value == EMtpPSStatusActive) { - if( !iMTPActive ) - { - MPX_DEBUG1("CMPXUsbEventHandler::DoHandlePSEvent - MTP Start"); - iObserver.HandleSystemEventL( EUSBMTPStartEvent, removableDrive ); - iState = KUsbPersonalityIdMTP; - iMTPActive = ETrue; - } + MPX_DEBUG1("CMPXUsbEventHandler::DoHandlePSEvent - MTP Start"); + iObserver.HandleSystemEventL( EUSBMTPStartEvent, removableDrive ); + iState = KUsbPersonalityIdMTP; } else if( value != EMtpPSStatusReadyToSync ) { MPX_DEBUG1("CMPXUsbEventHandler::DoHandlePSEvent - MTP Not Active"); iObserver.HandleSystemEventL( EUSBMTPNotActiveEvent, removableDrive ); iState = KUsbPersonalityIdMTP; - iMTPActive = EFalse; } } // Make sure MTP and MS flags are OFF @@ -231,7 +224,6 @@ { MPX_DEBUG1("CMPXUsbEventHandler::DoHandlePSEvent - MTP End"); iObserver.HandleSystemEventL( EUSBMTPEndEvent, removableDrive ); - iMTPActive = EFalse; } iState = KUsbWatcherSelectedPersonalityNone; }