stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-02-11 10:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not multithread loading the first config

Browse source 
Resolution in particular relies on this to be done in order...
This commit is contained in:
James R 2020-08-16 22:44:42 -07:00
parent 680d802d10
commit 2f32891919
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/command.c
View file

@ -778,11 +778,18 @@ static void COM_Exec_f(void)
ctx->noerror = COM_CheckParm("-noerror"); ctx->noerror = COM_CheckParm("-noerror");
ctx->silent = COM_CheckParm("-silent"); ctx->silent = COM_CheckParm("-silent");
if (COM_CheckParm("-singlethread"))
{
COM_Exec_Thread(ctx);
}
else
{
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
I_spawn_thread("exec-command", (I_thread_fn)COM_Exec_Thread, ctx); I_spawn_thread("exec-command", (I_thread_fn)COM_Exec_Thread, ctx);
#else #else
COM_Exec_Thread(ctx); COM_Exec_Thread(ctx);
#endif #endif
}
} }

2
src/m_misc.c
View file

@ -507,7 +507,7 @@ void M_FirstLoadConfig(void)
CV_InitFilterVar(); CV_InitFilterVar();
// load config, make sure those commands doesnt require the screen... // load config, make sure those commands doesnt require the screen...
COM_BufInsertText(va("exec \"%s\"\n", configfile)); COM_BufInsertText(va("exec \"%s\" -singlethread\n", configfile));
// no COM_BufExecute() needed; that does it right away // no COM_BufExecute() needed; that does it right away
// don't filter anymore vars and don't let this convsvar be changed // don't filter anymore vars and don't let this convsvar be changed