X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=75818dfc67d0fad777102152de3d377e7b2edbb0;hb=1dce7f7ee43baff38fdf09b8a7480de1cab662ff;hp=622b022c62e053da3ef298e2f676f031bda28d9f;hpb=86b440840c4a6989a196f0b2af9f4247a20aa218;p=rocksndiamonds.git

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);
   }