equal
deleted
inserted
replaced
2791 iOldSkin = KAknsNullPkgID; |
2791 iOldSkin = KAknsNullPkgID; |
2792 return; |
2792 return; |
2793 } |
2793 } |
2794 |
2794 |
2795 SetActiveSkinContent( iOldSkin ); |
2795 SetActiveSkinContent( iOldSkin ); |
2796 iSettings->WriteSkinSettings(iOldSkin, ETrue); |
2796 if ( MergeAndBroadcast() == KErrNone ) |
|
2797 { |
|
2798 iSettings->WriteSkinSettings(iOldSkin, ETrue); |
|
2799 } |
2797 iOldSkin = KAknsNullPkgID; |
2800 iOldSkin = KAknsNullPkgID; |
2798 MergeAndBroadcast(); |
|
2799 return; // if skin was on mmc, the wallpaper is handled aswell |
2801 return; // if skin was on mmc, the wallpaper is handled aswell |
2800 } |
2802 } |
2801 // skin was not on mmc, but wp was |
2803 // skin was not on mmc, but wp was |
2802 if ( iWPOnRemovableDrive && iWPFilename ) |
2804 if ( iWPOnRemovableDrive && iWPFilename ) |
2803 { |
2805 { |