Merge branch 'lemme-outa-room-menu' into 'master'

Don't get stuck in room menu in a modified game

See merge request KartKrew/Kart-Public!145
This commit is contained in:
Sryder 2019-06-27 14:16:37 -04:00
commit bcae3898dd

View file

@ -8432,7 +8432,11 @@ static void M_ConnectMenu(INT32 choice)
// first page of servers // first page of servers
serverlistpage = 0; serverlistpage = 0;
if (ms_RoomId < 0) if (ms_RoomId < 0)
{
M_RoomMenu(0); // Select a room instead of staring at an empty list M_RoomMenu(0); // Select a room instead of staring at an empty list
// This prevents us from returning to the modified game alert.
currentMenu->prevMenu = &MP_MainDef;
}
else else
M_SetupNextMenu(&MP_ConnectDef); M_SetupNextMenu(&MP_ConnectDef);
itemOn = 0; itemOn = 0;