X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=a4c95d26d0cabc1219aabfc2b98624155df29c2b;hb=1d7ec87196d24515b3d6e9400c689d9cd48c49f5;hp=3ef3df989bd6e5380d6ce39a64db2bf9b4b23fab;hpb=12d655114089868b305a112845ec0170ce664745;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 3ef3df98..a4c95d26 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7799,9 +7799,6 @@ static void InitProgramConfig(char *command_filename)
   char *config_filename = getProgramConfigFilename(command_filename);
   char *userdata_basename = getBaseNameNoSuffix(command_filename);
   char *userdata_subdir;
-#if defined(PLATFORM_UNIX)
-  char *userdata_subdir_unix;
-#endif
 
   // read default program config, if existing
   if (fileExists(config_filename))
@@ -7819,11 +7816,6 @@ static void InitProgramConfig(char *command_filename)
     LoadSetupFromFilename(config_filename);
   }
 
-#if defined(PLATFORM_UNIX)
-  // set user data directory for Linux/Unix (but not Mac OS X)
-  userdata_subdir_unix = getStringCat2(".", userdata_basename);
-#endif
-
   // set program title from potentially redefined program title
   if (setup.internal.program_title != NULL &&
       strlen(setup.internal.program_title) > 0)
@@ -7839,10 +7831,10 @@ static void InitProgramConfig(char *command_filename)
       strlen(setup.internal.program_icon_file) > 0)
     program_icon_file = getStringCopy(setup.internal.program_icon_file);
 
-#if defined(PLATFORM_WIN32) || defined(PLATFORM_MACOSX) || defined(PLATFORM_EMSCRIPTEN)
+#if defined(PLATFORM_WINDOWS) || defined(PLATFORM_MAC) || defined(PLATFORM_EMSCRIPTEN)
   userdata_subdir = program_title;
 #elif defined(PLATFORM_UNIX)
-  userdata_subdir = userdata_subdir_unix;
+  userdata_subdir = getStringCat2(".", userdata_basename);
 #else
   userdata_subdir = USERDATA_DIRECTORY_OTHER;
 #endif