diff -r 3b7506f63335 -r f3d2589f22d6 mmappcomponents/collectionhelper/src/mpxcollectionuihelperimp.cpp --- a/mmappcomponents/collectionhelper/src/mpxcollectionuihelperimp.cpp Wed Jun 16 16:05:08 2010 +0100 +++ b/mmappcomponents/collectionhelper/src/mpxcollectionuihelperimp.cpp Thu Jul 22 16:38:21 2010 +0100 @@ -38,6 +38,7 @@ #include #include #include +#include #include "mpxcollectionuihelperobserver.h" #include "mpxcollectionuihelperimp.h" @@ -1399,11 +1400,16 @@ { TInt usbStatus; RProperty::Get(KPSUidUsbWatcher, KUsbWatcherSelectedPersonality, usbStatus); - - if ((usbStatus == KUsbPersonalityIdMTP) || (usbStatus == KUsbPersonalityIdPCSuiteMTP) - || (usbStatus == KUsbPersonalityIdMS) ) + + TInt mtpStatus = EMtpPSStatusUninitialized; + RProperty::Get( KMtpPSUid, KMtpPSStatus, mtpStatus); + + MPX_DEBUG2("CMPXCollectionViewHgImp::ConstructL, mtpstatus = %d", mtpStatus); + + if ( (mtpStatus != EMtpPSStatusUninitialized) + || (usbStatus == KUsbPersonalityIdMS) ) { - MPX_DEBUG1("USB is active, Leave with KErrLocked"); + MPX_DEBUG1("MTP/USB is active, Leave with KErrLocked"); // need to call back even if it leaves here iHelperObserver = (MMPXCHelperObserver*)aCallback; CompleteTask( aTask, KErrLocked );