--- a/psln/Src/PslnScreenSaverView.cpp	Wed Sep 15 12:29:17 2010 +0300
+++ b/psln/Src/PslnScreenSaverView.cpp	Wed Oct 13 14:50:15 2010 +0300
@@ -279,7 +279,6 @@
         self->iModel->ActivateScreenSaver(
             KErrNotFound,
             EPslnScreenSaverPreviewDeactivation );
-        self->iScreenSaverPreviewing = EFalse;
 
         if ( self->iContainer )
             {
@@ -564,12 +563,6 @@
 //
 void CPslnScreenSaverView::HandleScreenSaverActivationL( TInt aCurrentItem )
     {
-    // Protect screensaver type during preview.
-    if ( iScreenSaverPreviewing )
-        {
-        return;
-        }
-
     TInt PsmMode = 0; 
     iPsmClient->PsmSettings().GetCurrentMode( PsmMode );
     if ( PsmMode == EPsmsrvModePowerSave ) // PSM on, setting is protected
@@ -617,12 +610,6 @@
 //
 void CPslnScreenSaverView::HandleScreenSaverPreviewL( TInt aCurrentItem )
     {
-    // Stop responding to preview again if screensaver is being previewed.
-    if ( iScreenSaverPreviewing )
-        {
-        return;
-        }
-
     TRAPD( err, DoInvokeScreenSaverFunctionL(
         aCurrentItem,
         EScpCapsPreviewNotification ) );
@@ -632,8 +619,7 @@
         // Start listening for screensaver preview mode key changes.
         CreatePreviewModeSubscriberL();
         CreatePreviewStateSubscriberL();
-
-        iScreenSaverPreviewing = ETrue;
+        
         User::LeaveIfError(
             iModel->ActivateScreenSaver(
                 aCurrentItem,