The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 03:46:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calls to File::SetUserPath() no longer need to manually append directory separators.

Browse Source
This commit is contained in:
Admiral H. Curtiss 2021-11-22 03:40:31 +01:00
parent e54657254a
commit ab56f3ecbd
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/jni/MainAndroid.cpp
View File

@ -387,7 +387,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetCacheDire
JNIEnv* env, jclass, jstring jDirectory) JNIEnv* env, jclass, jstring jDirectory)
{ {
std::lock_guard<std::mutex> guard(s_host_identity_lock); std::lock_guard<std::mutex> guard(s_host_identity_lock);
File::SetUserPath(D_CACHE_IDX, GetJString(env, jDirectory) + DIR_SEP); File::SetUserPath(D_CACHE_IDX, GetJString(env, jDirectory));
} }
JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_DefaultCPUCore(JNIEnv*, jclass) JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_DefaultCPUCore(JNIEnv*, jclass)

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

@ -54,7 +54,7 @@ namespace UICommon
static void CreateDumpPath(const std::string& path) static void CreateDumpPath(const std::string& path)
{ {
if (!path.empty()) if (!path.empty())
File::SetUserPath(D_DUMP_IDX, path + '/'); File::SetUserPath(D_DUMP_IDX, path);
File::CreateFullPath(File::GetUserPath(D_DUMPAUDIO_IDX)); File::CreateFullPath(File::GetUserPath(D_DUMPAUDIO_IDX));
File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX)); File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
File::CreateFullPath(File::GetUserPath(D_DUMPSSL_IDX)); File::CreateFullPath(File::GetUserPath(D_DUMPSSL_IDX));
@ -66,7 +66,7 @@ static void CreateDumpPath(const std::string& path)
static void CreateLoadPath(const std::string& path) static void CreateLoadPath(const std::string& path)
{ {
if (!path.empty()) if (!path.empty())
File::SetUserPath(D_LOAD_IDX, path + '/'); File::SetUserPath(D_LOAD_IDX, path);
File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX)); File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
File::CreateFullPath(File::GetUserPath(D_RIIVOLUTION_IDX)); File::CreateFullPath(File::GetUserPath(D_RIIVOLUTION_IDX));
} }
@ -74,7 +74,7 @@ static void CreateLoadPath(const std::string& path)
static void CreateResourcePackPath(const std::string& path) static void CreateResourcePackPath(const std::string& path)
{ {
if (!path.empty()) if (!path.empty())
File::SetUserPath(D_RESOURCEPACK_IDX, path + '/'); File::SetUserPath(D_RESOURCEPACK_IDX, path);
} }
static void CreateWFSPath(const std::string& path) static void CreateWFSPath(const std::string& path)
@ -217,7 +217,7 @@ void SetUserDirectory(const std::string& custom_path)
if (!custom_path.empty()) if (!custom_path.empty())
{ {
File::CreateFullPath(custom_path + DIR_SEP); File::CreateFullPath(custom_path + DIR_SEP);
File::SetUserPath(D_USER_IDX, custom_path + DIR_SEP); File::SetUserPath(D_USER_IDX, custom_path);
return; return;
} }
@ -281,15 +281,6 @@ void SetUserDirectory(const std::string& custom_path)
user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP; user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
CoTaskMemFree(my_documents); CoTaskMemFree(my_documents);
// Prettify the path: it will be displayed in some places, we don't want a mix
// of \ and /.
user_path = ReplaceAll(std::move(user_path), "\\", DIR_SEP);
// Make sure it ends in DIR_SEP.
if (user_path.back() != DIR_SEP_CHR)
user_path += DIR_SEP;
#else #else
if (File::IsDirectory(ROOT_DIR DIR_SEP USERDATA_DIR)) if (File::IsDirectory(ROOT_DIR DIR_SEP USERDATA_DIR))
{ {