From 2b48a20b76ef0ca85311bfce201477ea799b30d6 Mon Sep 17 00:00:00 2001
From: slothlife <slothlife@users.noreply.github.com>
Date: Fri, 28 Aug 2015 23:12:39 -0500
Subject: [PATCH] Fix weather transition bugs

---
 apps/openmw/mwworld/weather.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index da1f2f7e6..e7c67d2e1 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -736,7 +736,7 @@ bool WeatherManager::readRecord(ESM::ESMReader& reader, uint32_t type)
             mWeatherUpdateTime = state.mWeatherUpdateTime;
             mTransitionFactor = state.mTransitionFactor;
             mCurrentWeather = state.mCurrentWeather;
-            mNextWeather = state.mCurrentWeather;
+            mNextWeather = state.mNextWeather;
             mQueuedWeather = state.mQueuedWeather;
 
             mRegions.clear();
@@ -884,6 +884,8 @@ inline void WeatherManager::updateWeatherTransitions(const float elapsedRealSeco
             mCurrentWeather = mNextWeather;
         }
 
+        mNextWeather = invalidWeatherID;
+        mQueuedWeather = invalidWeatherID;
         mFastForward = false;
     }
 }