piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10241 from AdmiralCurtiss/user-dir-consistency

Browse Source 
Ensure user paths are stored in a consistent manner.
This commit is contained in:
Léo Lam
2022-01-01 02:32:24 +01:00
committed by GitHub
parent c6225e451c 269ae6f7e8
commit 9a61514073
10 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,10 +51,10 @@
namespace UICommon
{
static void CreateDumpPath(const std::string& path)
static void CreateDumpPath(std::string path)
{
if (!path.empty())
File::SetUserPath(D_DUMP_IDX, path + '/');
File::SetUserPath(D_DUMP_IDX, std::move(path));
File::CreateFullPath(File::GetUserPath(D_DUMPAUDIO_IDX));
File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
File::CreateFullPath(File::GetUserPath(D_DUMPSSL_IDX));
@ -63,18 +63,18 @@ static void CreateDumpPath(const std::string& path)
File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
}
static void CreateLoadPath(const std::string& path)
static void CreateLoadPath(std::string path)
{
if (!path.empty())
File::SetUserPath(D_LOAD_IDX, path + '/');
File::SetUserPath(D_LOAD_IDX, std::move(path));
File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
File::CreateFullPath(File::GetUserPath(D_RIIVOLUTION_IDX));
}
static void CreateResourcePackPath(const std::string& path)
static void CreateResourcePackPath(std::string path)
{
if (!path.empty())
File::SetUserPath(D_RESOURCEPACK_IDX, path + '/');
File::SetUserPath(D_RESOURCEPACK_IDX, std::move(path));
}
static void CreateWFSPath(const std::string& path)
@ -212,12 +212,12 @@ void CreateDirectories()
#endif
}
void SetUserDirectory(const std::string& custom_path)
void SetUserDirectory(std::string custom_path)
{
if (!custom_path.empty())
{
File::CreateFullPath(custom_path + DIR_SEP);
File::SetUserPath(D_USER_IDX, custom_path + DIR_SEP);
File::SetUserPath(D_USER_IDX, std::move(custom_path));
return;
}
@ -281,15 +281,6 @@ void SetUserDirectory(const std::string& custom_path)
user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
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
if (File::IsDirectory(ROOT_DIR DIR_SEP USERDATA_DIR))
{

2
Source/Core/UICommon/UICommon.h
View File

@ -23,7 +23,7 @@ void InhibitScreenSaver(bool enable);
void SetLocale(std::string locale_name);
void CreateDirectories();
void SetUserDirectory(const std::string& custom_path);
void SetUserDirectory(std::string custom_path);
bool TriggerSTMPowerEvent();