idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp
branchRCL_3
changeset 19 79311d856354
parent 18 d05a55b217df
child 23 7be2816dbabd
--- a/idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp	Wed Apr 14 15:47:59 2010 +0300
+++ b/idlehomescreen/xmluirendering/uiengine/src/xnbackgroundmanager.cpp	Tue Apr 27 16:26:12 2010 +0300
@@ -780,14 +780,15 @@
     // Add new to the cache
     if( aFileName != KNullDesC )
         {
-        if( CacheWallpaperL( aFileName, viewData ) == KErrNone )
+        err = CacheWallpaperL( aFileName, viewData ); 
+    
+        if( err == KErrNone )
             {
             SaveWallpaperL(); // to HSPS
             }
         else
             {
-            // image is corrupted or format is not supported
-            return KErrCACorruptContent;
+            return err;
             }
         }
     // WallpaperImage changed back to default. Update view data.
@@ -832,13 +833,13 @@
         {
         iBgImagePath = aFileName.AllocL();
     
-        TBool err( KErrNone );
+        err = KErrNone;
         TRAP( err, iSkinSrv.AddWallpaperL( aFileName, iRect.Size() ) );
-        if( err )
+        if( err != KErrNone )
             {
-            // image is corrupted or format is not supported
-            return KErrCACorruptContent;
+            return err;
             }
+        
         TRAP( err, iBgImage = iSkinSrv.WallpaperImageL( aFileName ) );
         if( err )
             {