diff -r e871a07c0ce0 -r 9dbe1b043bea skins/AknSkins/srvsrc/AknsSrv.cpp --- a/skins/AknSkins/srvsrc/AknsSrv.cpp Thu Jul 15 19:48:07 2010 +0300 +++ b/skins/AknSkins/srvsrc/AknsSrv.cpp Thu Aug 19 10:53:51 2010 +0300 @@ -2793,9 +2793,11 @@ } SetActiveSkinContent( iOldSkin ); - iSettings->WriteSkinSettings(iOldSkin, ETrue); + if ( MergeAndBroadcast() == KErrNone ) + { + iSettings->WriteSkinSettings(iOldSkin, ETrue); + } iOldSkin = KAknsNullPkgID; - MergeAndBroadcast(); return; // if skin was on mmc, the wallpaper is handled aswell } // skin was not on mmc, but wp was