diff -r dbd1c5e08735 -r 453dfc402455 mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp --- a/mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp Thu Jul 15 19:35:12 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp Thu Aug 19 10:44:03 2010 +0300 @@ -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 {