# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1262861197 -7200
# Node ID 35d9bdabf17510f35c570e92bd11fba711e8f0c5
# Parent  040fcad49f44b2e2eec3d3da8c609e5e33fcc251
Revision: 200951
Kit: 201001

diff -r 040fcad49f44 -r 35d9bdabf175 scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/bld.inf
--- a/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/bld.inf	Thu Dec 17 08:46:04 2009 +0200
+++ b/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/bld.inf	Thu Jan 07 12:46:37 2010 +0200
@@ -31,7 +31,7 @@
 ScreenSaverAnimPlugin.mmp
 PRJ_EXPORTS
 //../inc/NPNExtensions.h MW_LAYER_PLATFORM_EXPORT_PATH(NPNExtensions.h)
-../loc/ScreensaverAnimPlugin.loc MW_LAYER_LOC_EXPORT_PATH(ScreensaverAnimPlugin.loc)
+../loc/screensaveranimplugin.loc MW_LAYER_LOC_EXPORT_PATH(screensaveranimplugin.loc)
 
 ../rom/ScreenSaverAnimPlugin.iby          CORE_MW_LAYER_IBY_EXPORT_PATH(ScreenSaverAnimPlugin.iby)
 ../rom/ScreenSaverAnimPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(ScreenSaverAnimPluginResources.iby)	
diff -r 040fcad49f44 -r 35d9bdabf175 scrsaver/scrsaverplugins/SlideshowPlugin/group/bld.inf
--- a/scrsaver/scrsaverplugins/SlideshowPlugin/group/bld.inf	Thu Dec 17 08:46:04 2009 +0200
+++ b/scrsaver/scrsaverplugins/SlideshowPlugin/group/bld.inf	Thu Jan 07 12:46:37 2010 +0200
@@ -27,7 +27,7 @@
 #endif
 
 PRJ_EXPORTS
-../loc/SlideshowPlugin.loc MW_LAYER_LOC_EXPORT_PATH(SlideshowPlugin.loc)
+../loc/slideshowplugin.loc MW_LAYER_LOC_EXPORT_PATH(slideshowplugin.loc)
 
 ../rom/SlideshowPlugin.iby          CORE_MW_LAYER_IBY_EXPORT_PATH(SlideshowPlugin.iby)
 ../rom/SlideshowPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(SlideshowPluginResources.iby)
diff -r 040fcad49f44 -r 35d9bdabf175 src/screensaverctrlplugin.cpp
--- a/src/screensaverctrlplugin.cpp	Thu Dec 17 08:46:04 2009 +0200
+++ b/src/screensaverctrlplugin.cpp	Thu Jan 07 12:46:37 2010 +0200
@@ -493,11 +493,21 @@
         {
         err = iPlugin->Draw( gc );
         }
-	
-	if( err != KErrNone )
-		{
-		iPluginFlag.Set( EPluginFlagSuspend );
-		}
+    //Notice:add this code to shield the issue ELWG-7SF3R3.
+    //Prevent screensaver plugin from being called unexpected draw function,
+    //which would cause chosen images are not displayed.
+    //Check the err code return by iPlugin->Draw:
+    //If draw action is correct and iPluginFlag has already been set EPluginFlagSuspend,
+    //then clear this EPluginFlagSuspend
+    if ( KErrNone == err && iPluginFlag.IsSet( EPluginFlagSuspend ) )
+        {
+        iPluginFlag.Clear( EPluginFlagSuspend );
+        }
+
+    if( err != KErrNone )
+        {
+        iPluginFlag.Set( EPluginFlagSuspend );
+        }
     }
 
 // -----------------------------------------------------------------------------