item_ident(x, ISFLAG_KNOW_TYPE) is now deprecated in favour of

item_type_known(x).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@786 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 0 deletions

diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index f48947e93f..f3c3b7f4f6 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -86,7 +86,14 @@ static void pop_delay()
 static void clear_pending_delays()
 {
     while (you.delay_queue.size() > 1)
+    {
+        const delay_queue_item delay =
+            you.delay_queue[you.delay_queue.size() - 1];
         you.delay_queue.pop_back();
+        
+        if (is_run_delay(delay.type) && you.running)
+            stop_running();
+    }
 }
 
 void start_delay( int type, int turns, int parm1, int parm2 )