ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CommonPaths: Rename USERDATA_DIR to PORTABLE_USER_DIR

This commit is contained in:
OatmealDome 2023-01-17 14:13:14 -05:00
parent 2a2ee5d543
commit 846eef2a05
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/CommonPaths.h
View File

@ -10,20 +10,20 @@
// The user data dir // The user data dir
#define ROOT_DIR "." #define ROOT_DIR "."
#ifdef _WIN32 #ifdef _WIN32
#define USERDATA_DIR "User" #define PORTABLE_USER_DIR "User"
#define DOLPHIN_DATA_DIR "Dolphin" #define DOLPHIN_DATA_DIR "Dolphin"
#elif defined __APPLE__ #elif defined __APPLE__
// On OS X, USERDATA_DIR exists within the .app, but *always* reference // On OS X, PORTABLE_USER_DIR exists within the .app, but *always* reference
// the copy in Application Support instead! (Copied on first run) // the copy in Application Support instead! (Copied on first run)
// You can use the File::GetUserPath() util for this // You can use the File::GetUserPath() util for this
#define USERDATA_DIR "Contents/Resources/User" #define PORTABLE_USER_DIR "Contents/Resources/User"
#define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin" #define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin"
#elif defined ANDROID #elif defined ANDROID
#define USERDATA_DIR "user" #define PORTABLE_USER_DIR "user"
#define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu" #define DOLPHIN_DATA_DIR "/sdcard/dolphin-emu"
#define NOMEDIA_FILE ".nomedia" #define NOMEDIA_FILE ".nomedia"
#else #else
#define USERDATA_DIR "user" #define PORTABLE_USER_DIR "user"
#define DOLPHIN_DATA_DIR "dolphin-emu" #define DOLPHIN_DATA_DIR "dolphin-emu"
#endif #endif

8
Source/Core/UICommon/UICommon.cpp
View File

@ -345,7 +345,7 @@ void SetUserDirectory(std::string custom_path)
if (local) // Case 1-2 if (local) // Case 1-2
{ {
user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP;
} }
else if (configPath) // Case 3 else if (configPath) // Case 3
{ {
@ -370,15 +370,15 @@ void SetUserDirectory(std::string custom_path)
} }
else // Case 6 else // Case 6
{ {
user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP;
} }
CoTaskMemFree(appdata); CoTaskMemFree(appdata);
CoTaskMemFree(documents); CoTaskMemFree(documents);
#else #else
if (File::IsDirectory(ROOT_DIR DIR_SEP USERDATA_DIR)) if (File::IsDirectory(ROOT_DIR DIR_SEP PORTABLE_USER_DIR))
{ {
user_path = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP; user_path = ROOT_DIR DIR_SEP PORTABLE_USER_DIR DIR_SEP;
} }
else else
{ {