psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp
branchRCL_3
changeset 51 fcdfafb36fe7
parent 0 2f259fa3e83a
--- a/psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp	Thu Jul 15 18:56:19 2010 +0300
+++ b/psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp	Thu Aug 19 10:11:06 2010 +0300
@@ -121,21 +121,23 @@
                 res = iDRMHelper->CanSetAutomated(
                     aSelectedFiles->MdcaPoint( index ),
                     canBeAutomated );
-                if ( !res && !canBeAutomated )
+                if ( res == KErrNone && !canBeAutomated )
                     {
                     ShowErrorNoteL( R_PSLN_SLIDE_SET_DRM_ERROR );
-                    }
-                else if( res == KErrUnderflow )
-                    {
-                    ShowErrorNoteL( R_PSLN_SLIDE_SET_IMAGE_CORRUPTED );
+                    return EFalse;
                     }
-                else if ( ( res != KErrNone ) || !canBeAutomated )
+                else if ( res != KErrNone )
                     {
-                    if ( iDRMHelper )
+                    if ( res == KErrUnderflow )
                         {
-                        iDRMHelper->HandleErrorL(
-                            res, 
+                        // Do not show error note for corrupted image and let it pass.
+                        canBeAutomated = ETrue;
+                        }
+                    else
+                        {
+                        iDRMHelper->HandleErrorL( res,
                             aSelectedFiles->MdcaPoint( index ) );
+                        return EFalse;
                         }
                     }
                 else