lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix a crash.

Browse source
This commit is contained in:
toasterbabe 2017-09-25 20:35:04 +01:00
parent 295b100df4
commit 7fb2e6633e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/m_menu.c
View file

@ -2151,6 +2151,8 @@ static void M_GoBack(INT32 choice)
if ((currentMenu->prevMenu == &MainDef) && (currentMenu == &SP_TimeAttackDef || currentMenu == &SP_NightsAttackDef)) if ((currentMenu->prevMenu == &MainDef) && (currentMenu == &SP_TimeAttackDef || currentMenu == &SP_NightsAttackDef))
{ {
// D_StartTitle does its own wipe, since GS_TIMEATTACK is now a complete gamestate. // D_StartTitle does its own wipe, since GS_TIMEATTACK is now a complete gamestate.
Z_Free(levelselect.rows);
levelselect.rows = NULL;
menuactive = false; menuactive = false;
D_StartTitle(); D_StartTitle();
} }
@ -4279,6 +4281,12 @@ static void M_HandleLevelPlatter(INT32 choice)
if (exitmenu) if (exitmenu)
{ {
if (gamestate != GS_TIMEATTACK)
{
Z_Free(levelselect.rows);
levelselect.rows = NULL;
}
if (currentMenu->prevMenu) if (currentMenu->prevMenu)
{ {
M_SetupNextMenu(currentMenu->prevMenu); M_SetupNextMenu(currentMenu->prevMenu);
@ -4287,9 +4295,6 @@ static void M_HandleLevelPlatter(INT32 choice)
else else
M_ClearMenus(true); M_ClearMenus(true);
Z_Free(levelselect.rows);
levelselect.rows = NULL;
Z_Free(char_notes); Z_Free(char_notes);
char_notes = NULL; char_notes = NULL;
} }