fixed horrible bug causing memory access after last argument in 'argv[]'

[rocksndiamonds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 84004f468283e1c8b5e3e28b9948fa962fca2fb6..5de7b263d52437374d3dfe228024eefa16ded56d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -5630,10 +5630,10 @@ static void print_version()
 
 static void InitProgramConfig(char *command_filename)
 {
-  char *userdata_basename = getBaseNameNoSuffix(command_filename);
-  char *config_filename = getProgramConfigFilename(command_filename);
   char *program_title = PROGRAM_TITLE_STRING;
   char *program_icon_file = PROGRAM_ICON_FILENAME;
+  char *config_filename = getProgramConfigFilename(command_filename);
+  char *userdata_basename = getBaseNameNoSuffix(command_filename);
   char *userdata_subdir;
   char *userdata_subdir_unix;
 
@@ -5673,7 +5673,6 @@ static void InitProgramConfig(char *command_filename)
   InitProgramInfo(command_filename,
                  config_filename,
                  userdata_subdir,
-                 userdata_subdir_unix,
                  program_title,
                  program_title,
                  program_icon_file,
@@ -5690,7 +5689,7 @@ int main(int argc, char *argv[])
   InitExitFunction(CloseAllAndExit);
   InitPlatformDependentStuff();
 
-  GetOptions(argv, print_usage, print_version);
+  GetOptions(argc, argv, print_usage, print_version);
   OpenAll();
 
   EventLoop();