summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/acr.cc3
-rw-r--r--crawl-ref/source/delay.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 3c95861220..a285f6a0ee 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1535,7 +1535,8 @@ static void _input()
}
// Stop autoclearing more now that we have control back.
- reset_more_autoclear();
+ if (!you_are_delayed())
+ reset_more_autoclear();
if (need_to_autopickup())
autopickup();
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 83bff93763..482e61f524 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -334,6 +334,8 @@ void stop_delay( bool stop_stair_travel )
if (you.delay_queue.empty())
return;
+ reset_more_autoclear();
+
ASSERT(!crawl_state.arena);
delay_queue_item delay = you.delay_queue.front();