[2742178] Don't save when closing the window if the player is dead, allowing them to reload the save and still be alive.

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

1 files changed, 9 insertions, 2 deletions

diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 9db08291c6..b31ee1b9c0 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -847,8 +847,15 @@ int TilesFramework::getch_ck()
                 break;
 
             case SDL_QUIT:
-                save_game(true);
-                ASSERT(!"Shouldn't get here");
+                if (crawl_state.need_save)
+                {
+                    for (unsigned i = 0; i < crawl_state.exit_hooks.size(); ++i)
+                        crawl_state.exit_hooks[i]->restore_state();
+
+                    crawl_state.exit_hooks.clear();
+                    save_game(true);
+                }
+                exit(0);
                 break;
 
             case SDL_USEREVENT: