diff -r 3ae5cb0b4c02 -r a26669f87b46 mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp --- a/mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp Fri Jun 25 16:54:01 2010 +0800 +++ b/mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp Fri Jul 09 17:58:21 2010 +0800 @@ -185,7 +185,7 @@ if ((iDataProviders[index]->DataProviderId() != iDpIdDeviceDp) && (iDataProviders[index]->DataProviderId() != iDpIdProxyDp)) { - iDataProviderIds.Append(iDataProviders[index]->DataProviderId()); + iDataProviderIds.AppendL(iDataProviders[index]->DataProviderId()); } } @@ -484,7 +484,7 @@ Cancel(); //clean the root level snapshot - iSingletons.ObjectMgr().ObjectStore().CleanDBSnapshotL(ETrue); + TRAP_IGNORE(iSingletons.ObjectMgr().ObjectStore().CleanDBSnapshotL(ETrue)); //Schedule again to scan subdir iEnumerationState = EEnumeratingSubDirFiles; @@ -500,9 +500,7 @@ { Cancel(); iEnumerationState = EEnumeratingCleanDBSnapshot; - iSingletons.ObjectMgr().ObjectStore().CleanDBSnapshotL(EFalse); - - + TRAP_IGNORE(iSingletons.ObjectMgr().ObjectStore().CleanDBSnapshotL(EFalse)); } else {