From 7ca8dc376745818ab1b1ef3a7092d5f69775b54a Mon Sep 17 00:00:00 2001 From: Javier Martinez Date: Tue, 8 Apr 2025 15:40:06 -0400 Subject: [PATCH] Use std path utility for automatic path seperator handling. It was being done manually, which a TODO comment advised against. Using generic_string() from std::filesystem::path solves this. Fix encoding issue using generic_wstring instead. --- Source/Core/Common/FileUtil.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index ee2b330812..51a841ddec 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -442,12 +442,7 @@ FSTEntry ScanDirectoryTree(std::string directory, bool recursive) auto path_to_physical_name = [](const fs::path& path) { #ifdef _WIN32 - // TODO Ideally this would not be needed - dolphin really should not have code directly mucking - // about with directory separators (for host paths - emulated paths may require it) and instead - // use fs::path to interact with them. - auto wpath = path.wstring(); - std::ranges::replace(wpath, L'\\', L'/'); - return WStringToUTF8(wpath); + return WStringToUTF8(path.generic_wstring()); #else return PathToString(path); #endif