Merge remote-tracking branch 'blunted2night/loading_screen_fix'

apps/openmw/mwgui/loadingscreen.cpp

@@ -213,22 +213,26 @@ namespace MWGui
 
     void LoadingScreen::changeWallpaper ()
     {
-        std::vector<std::string> splash;
+        if (mResources.isNull ())
-
-        Ogre::StringVectorPtr resources = Ogre::ResourceGroupManager::getSingleton ().listResourceNames ("General", false);
-        for (Ogre::StringVector::const_iterator it = resources->begin(); it != resources->end(); ++it)
         {
-            if (it->size() < 6)
+            mResources = Ogre::StringVectorPtr (new Ogre::StringVector);
-                continue;
+
-            std::string start = it->substr(0, 6);
+            Ogre::StringVectorPtr resources = Ogre::ResourceGroupManager::getSingleton ().listResourceNames ("General", false);
-            boost::to_lower(start);
+            for (Ogre::StringVector::const_iterator it = resources->begin(); it != resources->end(); ++it)
+            {
+                if (it->size() < 6)
+                    continue;
+                std::string start = it->substr(0, 6);
+                boost::to_lower(start);
 
-            if (start == "splash")
+                if (start == "splash")
-                splash.push_back (*it);
+                    mResources->push_back (*it);
+            }
         }
-        if (splash.size())
+
+        if (mResources->size())
         {
-            std::string randomSplash = splash[rand() % splash.size()];
+            std::string randomSplash = mResources->at (rand() % mResources->size());
 
             Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton ().load (randomSplash, "General");
             mBackgroundImage->setImageTexture (randomSplash);

apps/openmw/mwgui/loadingscreen.hpp

@@ -42,6 +42,7 @@ namespace MWGui
         Ogre::Rectangle2D* mRectangle;
         Ogre::MaterialPtr mBackgroundMaterial;
 
+        Ogre::StringVectorPtr mResources;
 
         bool mLoadingOn;