thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-ban-readback' into 'master'

Browse source 
Fix banlist readback crash

See merge request KartKrew/Kart!2260
This commit is contained in:
James R. 2024-04-10 12:10:50 +00:00
commit e46f246c95
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_main.cpp
View file

@ -1805,7 +1805,6 @@ void D_SRB2Main(void)
PR_LoadProfiles(); // load control profiles PR_LoadProfiles(); // load control profiles
SV_LoadStats(); SV_LoadStats();
SV_LoadBans();
#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL) #if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen
@ -1966,6 +1965,8 @@ void D_SRB2Main(void)
autostart = true; autostart = true;
CON_SetLoadingProgress(LOADED_DCHECKNETGAME); CON_SetLoadingProgress(LOADED_DCHECKNETGAME);
SV_LoadBans(); // Must be after D_CheckNetGame, or winsock getaddrinfo isn't ready and readback throws a fit
if (splitscreen && !M_CheckParm("-connect")) // Make sure multiplayer & autostart is set if you have splitscreen, even after D_CheckNetGame if (splitscreen && !M_CheckParm("-connect")) // Make sure multiplayer & autostart is set if you have splitscreen, even after D_CheckNetGame
multiplayer = autostart = true; multiplayer = autostart = true;