From 8374b9e1b47017d35a31b7c18ee3570c62d45078 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 9 Feb 2020 22:57:04 +0100 Subject: [PATCH] - fixed: The menu code should not reset the global input state when trying to close a menu with none open. --- source/common/menu/menu.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/common/menu/menu.cpp b/source/common/menu/menu.cpp index caf9888f7..bda47be84 100644 --- a/source/common/menu/menu.cpp +++ b/source/common/menu/menu.cpp @@ -922,6 +922,7 @@ void M_Drawer (void) void M_ClearMenus (bool final) { + if (menuactive == MENU_Off) return; M_DemoNoPlay = false; transition.previous = transition.current = nullptr; transition.dir = 0; @@ -937,8 +938,8 @@ void M_ClearMenus (bool final) menuactive = MENU_Off; if (!final) { - mouseGrabInput(true); - gi->MenuClosed(); + mouseGrabInput(true); + gi->MenuClosed(); } }