Allow graceful shutdown rather than a forced save (win32 console).

This injects a fake key code into the input stream, making the syscall
return.  The pseudo-signal handler thread will then wait forever (for a
value of "forever" of 15 seconds).

1 files changed, 4 insertions, 7 deletions

diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc
index 3beb1363e2..d84110f2f7 100644
--- a/crawl-ref/source/libutil.cc
+++ b/crawl-ref/source/libutil.cc
@@ -1195,14 +1195,11 @@ static BOOL WINAPI console_handler(DWORD sig)
     case CTRL_LOGOFF_EVENT:
     case CTRL_SHUTDOWN_EVENT:
         if (crawl_state.seen_hups++)
-            return true;
+            return true; // abort immediately
+
+        w32_insert_escape();
 
-        // SAVE CORRUPTING BUG!!!  We're in a sort-of-a-signal-handler here,
-        // unlike Unix which processes signals as an interrupt, Windows spawns
-        // a new thread to handle them.  This function will try to save the
-        // game when it is likely to be in an inconsistent state -- and even
-        // worse, the main thread is actively changing data structures.
-        sighup_save_and_exit();
+        Sleep(15000); // allow 15 seconds for shutdown, then kill -9
         return true;
     }
 }