From 56f656516d8ed10c15403cfe4dd2b130c551ba41 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 16 Jan 2018 11:00:48 +0200 Subject: [PATCH] Fixed rare crash when menu is closed from Ticker() function https://forum.zdoom.org/viewtopic.php?t=59112 --- src/menu/menu.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index db0fd2efb..86ec78abf 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -735,7 +735,11 @@ void M_Ticker (void) if (CurrentMenu != nullptr && menuactive != MENU_Off) { CurrentMenu->CallTicker(); + } + // Check again because menu could be closed from Ticker() + if (CurrentMenu != nullptr && menuactive != MENU_Off) + { for (int i = 0; i < NUM_MKEYS; ++i) { if (MenuButtons[i].bDown)