From e637fe3ea7840a52d31f5e305b40bb0dba7138ab Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 26 May 2009 01:56:35 +0000 Subject: [PATCH] - Recoverable errors that are caught during the demo loop no longer shut off the menu. SVN r1609 (trunk) --- docs/rh-log.txt | 2 ++ src/d_main.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index a653179f7..78c0ea3d1 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ May 25, 2009 +- Recoverable errors that are caught during the demo loop no longer shut off + the menu. - Specifying non-existent directories with -savedir or the save_dir cvar now attempts to create them. - I_CheckNativeMouse() now checks the foreground window to determine if the diff --git a/src/d_main.cpp b/src/d_main.cpp index 8ff94da85..ddf7c1a7c 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -783,7 +783,10 @@ void D_ErrorCleanup () playeringame[0] = 1; players[0].playerstate = PST_LIVE; gameaction = ga_fullconsole; - menuactive = MENU_Off; + if (gamestate == GS_DEMOSCREEN) + { + menuactive = MENU_Off; + } insave = false; }