From 560cb90f35840a7cb99cc1bfbed1649a6bbbdb1a Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Tue, 18 Oct 2016 15:10:08 -0400 Subject: [PATCH] use app name instead of title for prefs path --- src/cfile/cfile.cpp | 2 +- src/launcher/launcherini.cpp | 2 +- src/network/stand_gui.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cfile/cfile.cpp b/src/cfile/cfile.cpp index e3d64ee..d2f213c 100644 --- a/src/cfile/cfile.cpp +++ b/src/cfile/cfile.cpp @@ -1526,7 +1526,7 @@ int cfile_init_paths() } // now for the user/pref directory, the writable location - char *u_path = SDL_GetPrefPath(Osreg_company_name, Osreg_title); + char *u_path = SDL_GetPrefPath(Osreg_company_name, Osreg_app_name); // make sure we have something if (u_path == NULL) { diff --git a/src/launcher/launcherini.cpp b/src/launcher/launcherini.cpp index f903663..529d703 100644 --- a/src/launcher/launcherini.cpp +++ b/src/launcher/launcherini.cpp @@ -79,7 +79,7 @@ static int profile_init() return 0; } - char *u_path = SDL_GetPrefPath(Osreg_company_name, Osreg_title); + char *u_path = SDL_GetPrefPath(Osreg_company_name, Osreg_app_name); // make sure we have something if (u_path == NULL) { diff --git a/src/network/stand_gui.cpp b/src/network/stand_gui.cpp index a069574..39c212a 100644 --- a/src/network/stand_gui.cpp +++ b/src/network/stand_gui.cpp @@ -34,19 +34,19 @@ // taken from osregistry.cpp const char *Osreg_company_name = "Volition"; #if defined(FS1_DEMO) -const char *Osreg_title = "FreeSpace Demo"; +const char *Osreg_app_name = "FreeSpaceDemo"; #define PROFILE_NAME "FreeSpaceDemo.ini" #elif defined(FS2_DEMO) -const char *Osreg_title = "FreeSpace 2 Demo"; +const char *Osreg_app_name = "FreeSpace2Demo"; #define PROFILE_NAME "FreeSpace2Demo.ini" #elif defined(OEM_BUILD) -const char *Osreg_title = "FreeSpace 2 OEM"; +const char *Osreg_app_name = "FreeSpace2OEM"; #define PROFILE_NAME "FreeSpace2OEM.ini" #elif defined(MAKE_FS1) -const char *Osreg_title = "FreeSpace"; +const char *Osreg_app_name = "FreeSpace"; #define PROFILE_NAME "FreeSpace.ini" #else -const char *Osreg_title = "FreeSpace 2"; +const char *Osreg_app_name = "FreeSpace2"; #define PROFILE_NAME "FreeSpace2.ini" #endif @@ -1135,7 +1135,7 @@ bool Standalone::startFreeSpace(int argc, wxCmdLineArgsArray &argv) // if port isn't specified on cmdline, check ini file for "ForcePort" value if ( !cmd_port ) { - char *u_path = SDL_GetPrefPath(Osreg_company_name, Osreg_title); + char *u_path = SDL_GetPrefPath(Osreg_company_name, Osreg_app_name); if (u_path) { wxFileName ini_name(u_path, PROFILE_NAME); -- 2.39.2