1 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index dad3f3faf6..ca8da8a4ee 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1414,6 +1414,15 @@ static void _input()
     if (need_to_autoinscribe())
         autoinscribe();
 
+    if (i_feel_safe() && you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED])
+    {
+        weapon_switch(you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED]);
+        print_stats();
+
+        // To prevent spam in case the weapon can't be switched back to.
+        you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
+    }
+
     handle_delay();
 
     const coord_def cwhere = grid2view(you.pos());