diff -r 8696bb5a6e6e -r 56a6a91a2a3e filemanager/Engine/src/CFileManagerUtils.cpp --- a/filemanager/Engine/src/CFileManagerUtils.cpp Mon Mar 08 21:43:10 2010 +0000 +++ b/filemanager/Engine/src/CFileManagerUtils.cpp Sun Mar 14 13:08:45 2010 +0000 @@ -226,18 +226,17 @@ RFile64 drmFile; - User::LeaveIfError( drmFile.Open( - iFs, aFullPath, EFileRead | EFileShareReadersOrWriters ) ); - CleanupClosePushL( drmFile ); - DRM::CDrmUtility *drmCheck = DRM::CDrmUtility::NewLC(); + User::LeaveIfError( drmFile.Open( + iFs, aFullPath, EFileRead | EFileShareReadersOrWriters ) ); + CleanupClosePushL( drmFile ); + DRM::CDrmUtility *drmCheck = DRM::CDrmUtility::NewLC(); - TBool isProtected( EFalse ); - if ( drmCheck->IsProtectedL(drmFile) ) - { - isProtected = ETrue; - } - CleanupStack::PopAndDestroy(drmCheck); - CleanupStack::PopAndDestroy( &drmFile ); + TBool isProtected( EFalse ); + TRAP_IGNORE( isProtected = drmCheck->IsProtectedL( drmFile ) ); + + CleanupStack::PopAndDestroy( drmCheck ); + CleanupStack::PopAndDestroy( &drmFile ); + return isProtected; #endif }