--- a/filemanager/Engine/src/CFileManagerUtils.cpp Tue Feb 02 00:03:31 2010 +0200
+++ b/filemanager/Engine/src/CFileManagerUtils.cpp Fri Feb 19 22:41:53 2010 +0200
@@ -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
}