From d43766d3c9936c3875c1f2bcd0d88c68558dc9f6 Mon Sep 17 00:00:00 2001
From: Capostrophic <Capostrophic@users.noreply.github.com>
Date: Sun, 10 Jun 2018 17:47:05 +0300
Subject: [PATCH] Make WakeUpPC interrupt waiting if it was supposed to be
 (fixes #3629)

---
 CHANGELOG.md                     | 1 +
 apps/openmw/mwgui/waitdialog.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3101056e..5a22b9d47 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index 61febf315..52575e25c 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/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();
     }
 
 }