From c6c254d279259a105fe4acee9f86a794af700750 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 22 May 2014 11:08:36 +0200
Subject: [PATCH] Do not trigger levelup if rest was interrupted

---
 apps/openmw/mwgui/waitdialog.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index d5b52ebae..7eaba9361 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -219,8 +219,20 @@ namespace MWGui
         }
 
         if (mCurHour > mHours)
+        {
             stopWaiting();
 
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
+            const MWMechanics::NpcStats &pcstats = MWWorld::Class::get(player).getNpcStats(player);
+
+            // trigger levelup if possible
+            const MWWorld::Store<ESM::GameSetting> &gmst =
+                MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
+            if (mSleeping && pcstats.getLevelProgress () >= gmst.find("iLevelUpTotal")->getInt())
+            {
+                MWBase::Environment::get().getWindowManager()->pushGuiMode (GM_Levelup);
+            }
+        }
     }
 
     void WaitDialog::stopWaiting ()
@@ -230,17 +242,6 @@ namespace MWGui
         MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Rest);
         MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_RestBed);
         mWaiting = false;
-
-        MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
-        const MWMechanics::NpcStats &pcstats = MWWorld::Class::get(player).getNpcStats(player);
-
-        // trigger levelup if possible
-        const MWWorld::Store<ESM::GameSetting> &gmst =
-            MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
-        if (mSleeping && pcstats.getLevelProgress () >= gmst.find("iLevelUpTotal")->getInt())
-        {
-            MWBase::Environment::get().getWindowManager()->pushGuiMode (GM_Levelup);
-        }
     }