skins/AknSkins/srvsrc/AknsSrv.cpp
branchRCL_3
changeset 58 a2f9480e2280
parent 55 33ddb261ab37
child 78 0b86c25b743a
--- a/skins/AknSkins/srvsrc/AknsSrv.cpp	Tue May 11 17:09:13 2010 +0300
+++ b/skins/AknSkins/srvsrc/AknsSrv.cpp	Tue May 25 13:47:21 2010 +0300
@@ -263,6 +263,13 @@
     iWallpaperCache->ResetAndDestory( );
     
     iSlidesetEnableAppUidArray.Close();
+
+    if ( iPackageArray )
+        {
+        iPackageArray->ResetAndDestroy();
+        delete iPackageArray;
+        iPackageArray = NULL;
+        }
     }
 
 // -----------------------------------------------------------------------------
@@ -1465,14 +1472,16 @@
                 User::LeaveIfError( err );
                 }
             
-            isprotected = AknsSrvUtils::IsDrmProtectedL(aFilename);
             if (!BaflUtils::FileExists(iFsSession, aFilename))
                 {
                 iSettings->WriteIdleBackgroundToDefault();
                 return;
                 }
             }
+
+        isprotected = AknsSrvUtils::IsDrmProtectedL(aFilename);
         }
+
     if (isprotected)
         {
         CheckAndCreateDRMHelper();
@@ -2281,12 +2290,6 @@
             sizeof(TAknsSrvSkinInfoPkg),sizeof(TAknsSrvSkinInfoPkg));
         aMessage.Write(1,pkgptr,count*sizeof(TAknsSrvSkinInfoPkg));
         }
-    if ( iPackageArray )
-        {
-        iPackageArray->ResetAndDestroy();
-        }
-    delete iPackageArray;
-    iPackageArray = NULL;
     }
 
 // -----------------------------------------------------------------------------