zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 20:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed rare crash when menu is closed from Ticker() function

Browse source 
https://forum.zdoom.org/viewtopic.php?t=59112
This commit is contained in:
alexey.lysiuk 2018-01-16 11:00:48 +02:00
parent 13c4e58c3d
commit 56f656516d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/menu/menu.cpp
View file

@ -735,7 +735,11 @@ void M_Ticker (void)
if (CurrentMenu != nullptr && menuactive != MENU_Off) if (CurrentMenu != nullptr && menuactive != MENU_Off)
{ {
CurrentMenu->CallTicker(); 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) for (int i = 0; i < NUM_MKEYS; ++i)
{ {
if (MenuButtons[i].bDown) if (MenuButtons[i].bDown)