--- a/scrsaver/scrsaverplugins/SlideshowPlugin/src/SlideshowPlugin.cpp	Thu Jul 15 18:39:54 2010 +0300
+++ b/scrsaver/scrsaverplugins/SlideshowPlugin/src/SlideshowPlugin.cpp	Thu Aug 19 09:55:47 2010 +0300
@@ -789,16 +789,11 @@
 void CSlideshowPlugin::LoadRandomSlidesL()
     {
     SSPLOGGER_ENTERFN("LoadRandomSlidesL()");
-
     // Start by getting rid of possibly loaded slides
     iModel->DeleteAll();
-
-    // connect to MDS
+    // connect to MDS, load data or not
     ConnectToMDSSessionL();
 
-    // Wait for query of MDS to complete before continuing
-    WaitForMDS();
-
     SSPLOGGER_LEAVEFN("LoadRandomSlidesL()");
     }
 
@@ -940,6 +935,8 @@
     if (!iMdESession)
         {
         iMdESession = CMdESession::NewL( *this );
+        // Wait for query of MDS to complete before continuing
+        WaitForMDS();
         }
     }