From 1868fe74042aa3ae866152c161df8c9cfd70936c Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Tue, 16 Nov 2021 08:48:35 +0900 Subject: [PATCH] [qw] Save and load cvars before input config Saving is not so important, but for loading, while the input system doesn't make much use of cvars at this stage, it makes sense for them to be loaded before the input system configuration is loaded. --- qw/source/cl_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qw/source/cl_main.c b/qw/source/cl_main.c index 540fcedec..a4a72ed45 100644 --- a/qw/source/cl_main.c +++ b/qw/source/cl_main.c @@ -1507,8 +1507,8 @@ Host_WriteConfiguration (void) { if (host_initialized && cl_writecfg->int_val) { plitem_t *config = PL_NewDictionary (0); //FIXME hashlinks - IN_SaveConfig (config); Cvar_SaveConfig (config); + IN_SaveConfig (config); const char *path = va (0, "%s/quakeforge.cfg", qfs_gamedir->dir.def); QFile *f = QFS_WOpen (path, 0); @@ -1543,8 +1543,8 @@ Host_ReadConfiguration (const char *cfg_name) return 0; } - IN_LoadConfig (config); Cvar_LoadConfig (config); + IN_LoadConfig (config); PL_Free (config); return 1;