Merge remote-tracking branch 'origin/master'

apps/openmw/mwgui/messagebox.cpp

@@ -117,8 +117,11 @@ namespace MWGui
 
     bool MessageBoxManager::createInteractiveMessageBox (const std::string& message, const std::vector<std::string>& buttons)
     {
-        if(mInterMessageBoxe != NULL) {
-            throw std::runtime_error("There is a message box already");
+        if (mInterMessageBoxe != NULL)
+        {
+            std::cerr << "Warning: replacing an interactive message box that was not answered yet" << std::endl;
+            delete mInterMessageBoxe;
+            mInterMessageBoxe = NULL;
         }
 
         mInterMessageBoxe = new InteractiveMessageBox(*this, message, buttons);

apps/openmw/mwworld/weather.cpp

@@ -627,7 +627,7 @@ void WeatherManager::update(float duration, bool paused)
     MWBase::World& world = *MWBase::Environment::get().getWorld();
     TimeStamp time = world.getTimeStamp();
 
-    if(!paused)
+    if(!paused || mFastForward)
     {
         // Add new transitions when either the player's current external region changes.
         std::string playerRegion = Misc::StringUtils::lowerCase(player.getCell()->getCell()->mRegion);