From 86ad576675d46fa647290ff1ee4cc9bdfe118d0b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 12 Oct 2020 08:07:51 +0200 Subject: [PATCH] - fixed lockup on Shareware screen when quitting Duke MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two errors: the menu wasn’t closed and the shareware check was inverted. --- source/core/menu/razemenu.cpp | 1 + source/games/duke/src/game_misc.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/core/menu/razemenu.cpp b/source/core/menu/razemenu.cpp index ecee40e17..cccb1ca45 100644 --- a/source/core/menu/razemenu.cpp +++ b/source/core/menu/razemenu.cpp @@ -216,6 +216,7 @@ CCMD(menu_quit) DMenu* newmenu = CreateMessageBoxMenu(CurrentMenu, EndString, 0, false, NAME_None, []() { + M_ClearMenus(); gi->ExitFromMenu(); }); diff --git a/source/games/duke/src/game_misc.cpp b/source/games/duke/src/game_misc.cpp index 66c635aa0..0fa94f55a 100644 --- a/source/games/duke/src/game_misc.cpp +++ b/source/games/duke/src/game_misc.cpp @@ -98,7 +98,7 @@ template void runtwoscreens(func completion) { // shareware and TEN screens - if (!isShareware() && !isRR()) + if (isShareware() && !isRR()) showtwoscreens(completion); else completion(false); }