diff options
author | bunnei <bunneidev@gmail.com> | 2018-07-21 18:30:04 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 18:30:04 -0700 |
commit | 9533875eeb729d20ce2f92e9363a55c5894d262a (patch) | |
tree | fb594e919f10e136dfcb523a71b1dd6a3a30bb53 /src/core/hle | |
parent | d95a1a3742274fddc32fbc9c27a793c026422a2e (diff) | |
parent | d66b43dadfac1e9324fee48e97361e2f858f8af5 (diff) |
Merge pull request #760 from lioncash/path
file_util: Use an enum class for GetUserPath()
Diffstat (limited to 'src/core/hle')
-rw-r--r-- | src/core/hle/service/filesystem/filesystem.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index dffcdfbaf..671e0b8d0 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp @@ -272,9 +272,9 @@ void RegisterFileSystems() { sdmc_factory = nullptr; auto nand_directory = std::make_shared<FileSys::RealVfsDirectory>( - FileUtil::GetUserPath(D_NAND_IDX), FileSys::Mode::Write); + FileUtil::GetUserPath(FileUtil::UserPath::NANDDir), FileSys::Mode::Write); auto sd_directory = std::make_shared<FileSys::RealVfsDirectory>( - FileUtil::GetUserPath(D_SDMC_IDX), FileSys::Mode::Write); + FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir), FileSys::Mode::Write); auto savedata = std::make_unique<FileSys::SaveDataFactory>(std::move(nand_directory)); save_data_factory = std::move(savedata); diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 691b1d106..bad27894a 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp @@ -42,7 +42,7 @@ PL_U::PL_U() : ServiceFramework("pl:u") { RegisterHandlers(functions); // Attempt to load shared font data from disk - const std::string filepath{FileUtil::GetUserPath(D_SYSDATA_IDX) + SHARED_FONT}; + const std::string filepath{FileUtil::GetUserPath(FileUtil::UserPath::SysDataDir) + SHARED_FONT}; FileUtil::CreateFullPath(filepath); // Create path if not already created FileUtil::IOFile file(filepath, "rb"); |