From 83e1a3a944d6d999d615d0836d8720847a111fc8 Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Mon, 27 Apr 2020 18:22:24 +0200 Subject: [PATCH] Move config dir detection earlier Setting up configuration file location is a dependency for: $ dosbox -printconf $ dosbox -editconf vim $ dosbox -eraseconf Wee need to have cache initialized before these parameters are handled. --- src/gui/sdlmain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index f884c373..6e66209d 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -3089,6 +3089,8 @@ int main(int argc, char* argv[]) { Disable_OS_Scaling(); //Do this early on, maybe override it through some parameter. OverrideWMClass(); // Before SDL2 video subsystem is initialized + CROSS_DetermineConfigPaths(); + CommandLine com_line(argc,argv); Config myconf(&com_line); control=&myconf; @@ -3156,8 +3158,6 @@ int main(int argc, char* argv[]) { sdl.laltstate = SDL_KEYUP; sdl.raltstate = SDL_KEYUP; - CROSS_DetermineConfigPaths(); - /* Parse configuration files */ std::string config_file, config_path, config_combined; Cross::GetPlatformConfigDir(config_path);