Merge pull request #1746 from Capostrophic/interrupt

Make WakeUpPC interrupt waiting if it was supposed to be (bug #3629)

CHANGELOG.md

@@ -4,6 +4,7 @@
     Bug #2835: Player able to slowly move when overencumbered
     Bug #3374: Touch spells not hitting kwama foragers
     Bug #3591: Angled hit distance too low
+    Bug #3629: DB assassin attack never triggers creature spawning
     Bug #3897: Have Goodbye give all choices the effects of Goodbye
     Bug #3997: Almalexia doesn't pace
     Bug #4036: Weird behaviour of AI packages if package target has non-unique ID

apps/openmw/mwgui/waitdialog.cpp

@@ -310,8 +310,10 @@ namespace MWGui
     void WaitDialog::wakeUp ()
     {
         mSleeping = false;
-        mTimeAdvancer.stop();
-        stopWaiting();
+        if (mInterruptAt != -1)
+            onWaitingInterrupted();
+        else
+            stopWaiting();
     }
 
 }