--- a/psln/pslnengine/src/PslnModel.cpp	Wed Sep 15 12:29:17 2010 +0300
+++ b/psln/pslnengine/src/PslnModel.cpp	Wed Oct 13 14:50:15 2010 +0300
@@ -1839,13 +1839,19 @@
             {
             iScreenSaverInfo = CPslnScreenSaverInfo::NewL();
             }
-        iScreenSaverInfo->iFileName->Des().Zero();
         
         //backup current screensaver settings
         error = iScreenSaverRepository->Get(
             KScreenSaverObject,
             iScreenSaverInfo->iScreenSaverType );
 
+        if ( iScreenSaverInfo->iScreenSaverType == KPslnSsObject )
+            {
+            TPtr ptr = iScreenSaverInfo->iFileName->Des();
+            error = iScreenSaverRepository->Get(
+                KScreenSaverPluginName,
+                ptr );
+            }
         if ( previewSsType == KPslnSsText )
             {
             TPtr ptr = iScreenSaverInfo->iScreenSaverTxt->Des();
@@ -1853,13 +1859,6 @@
                 KScreenSaverText,
                 ptr );
             }
-        else if ( previewSsType == KPslnSsObject )
-            {
-            TPtr ptr = iScreenSaverInfo->iFileName->Des();
-            error = iScreenSaverRepository->Get(
-                KScreenSaverPluginName,
-                ptr );
-            }
             
         //set values to screen saver needed to preview
         if ( previewSsType == KPslnSsText )
@@ -1909,13 +1908,13 @@
             previewSsType );
 
         //restore the screen saver settings.
-        if ( iScreenSaverInfo->iFileName->Des().Compare( KNullDesC ) )
+        if ( iScreenSaverInfo->iScreenSaverType == KPslnSsObject )
             {
             error = iScreenSaverRepository->Set(
                 KScreenSaverPluginName,
                 iScreenSaverInfo->iFileName->Des() );
             }
-        else if ( previewSsType == KPslnSsText )
+        if ( previewSsType == KPslnSsText )
             {
             error = iScreenSaverRepository->Set(
                 KScreenSaverText,