From 1dce7f7ee43baff38fdf09b8a7480de1cab662ff Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Wed, 14 Mar 2018 19:41:20 +0100 Subject: [PATCH] fixed bug with deriving game data directory from default 'setup.conf' --- src/main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 622b022c..75818dfc 100644 --- a/src/main.c +++ b/src/main.c @@ -7688,10 +7688,14 @@ static void InitProgramConfig(char *command_filename) if (fileExists(config_filename)) { // if program config file exists, derive Unix user data directory from it - userdata_basename = getBaseName(config_filename); + // (but only if the program config file is not generic "setup.conf" file) + if (!strEqual(getBaseNamePtr(config_filename), SETUP_FILENAME)) + { + userdata_basename = getBaseName(config_filename); - if (strSuffix(userdata_basename, ".conf")) - userdata_basename[strlen(userdata_basename) - 5] = '\0'; + if (strSuffix(userdata_basename, ".conf")) + userdata_basename[strlen(userdata_basename) - 5] = '\0'; + } LoadSetupFromFilename(config_filename); } -- 2.34.1