Skip to content

Commit

Permalink
Fix occasional menu softlock
Browse files Browse the repository at this point in the history
Sometimes when returning to mainmenu, the opening animation would not
start. You then could not do anything to get out, kinda softlocking the
game. Turns out the animation did start, but UI_SetActiveMenu kept being
called for "mainMenu" over and over again, restarting the animation
continuously.

Seems like the engine code repeats calls to UI_SetActiveMenu when
fullscreen is false. But fullscreen for main menu should always be true.
In the softlock case, it was set to false in UI_FrameTop_Graphics,
because seemingly ingameFlag was not reset to false correctly. As main
menu should never be ingame, just making sure to reset ingameFlag to
false whenever the main menu is started now.
  • Loading branch information
kugelrund committed Apr 23, 2022
1 parent a43f4ae commit 9d05ff6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions ui/ui_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3779,6 +3779,7 @@ void UI_MainMenu(void)
return;
}
//#endif
ingameFlag = qfalse;
holoMatch = qfalse;

loadModelFlag = qfalse;
Expand Down

0 comments on commit 9d05ff6

Please sign in to comment.