--- a/src/screensaverctrlplugin.cpp	Wed Sep 15 12:13:53 2010 +0300
+++ b/src/screensaverctrlplugin.cpp	Wed Oct 13 14:33:00 2010 +0300
@@ -63,6 +63,8 @@
 void CScreensaverCtrlPlugin::StartTimer()
     {
     // Notify plugin that screensaver is starting
+    Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOn );
+    
     SendPluginEvent( EScreensaverEventStarting );
     
     
@@ -282,7 +284,6 @@
     SCRLOGGER_WRITE("Host: ExitPartialMode()");
 
     LcdPartialMode()->Exit();
-    Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOn );
     // Make sure the partial area is empty
     // Make this less idiotic
     TRect psRect( 0, 0, 0, 0);
@@ -588,13 +589,6 @@
     if( err != KErrNone )
         {
         // Loaded OK, but failed to initialize - cannot use plugin
-        TBool changed = Model().SharedDataInterface()->GetDisplayObjChanged();
-        if( !changed )
-            {
-            //Just activate the screensaver revert to defaultsaver
-            RevertToDefaultSaver();
-            }
-        Model().SharedDataInterface()->SetDisplayObjChanged( EFalse );
         delete iPlugin;
         iPlugin = NULL;
         }