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

Merge pull request #5715 from JosJuice/non-ascii-dofilesearch 

Fix DoFileSearch for non-ASCII paths on Windows
This commit is contained in:
shuffle2 2017-06-28 01:01:43 -07:00 committed by GitHub
parent a63ee78723 98b0d8a119
commit 17fe293981
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/FileSearch.cpp
View File

@ -74,7 +74,7 @@ std::vector<std::string> DoFileSearch(const std::vector<std::string>& directorie
std::vector<fs::path> native_exts; std::vector<fs::path> native_exts;
for (const auto& ext : exts) for (const auto& ext : exts)
native_exts.push_back(ext); native_exts.push_back(fs::u8path(ext));
// N.B. This avoids doing any copies // N.B. This avoids doing any copies
auto ext_matches = [&native_exts](const fs::path& path) { auto ext_matches = [&native_exts](const fs::path& path) {
@ -100,12 +100,12 @@ std::vector<std::string> DoFileSearch(const std::vector<std::string>& directorie
if (recursive) if (recursive)
{ {
// TODO use fs::directory_options::follow_directory_symlink ? // TODO use fs::directory_options::follow_directory_symlink ?
for (auto& entry : fs::recursive_directory_iterator(fs::path(directory))) for (auto& entry : fs::recursive_directory_iterator(fs::u8path(directory)))
add_filtered(entry); add_filtered(entry);
} }
else else
{ {
for (auto& entry : fs::directory_iterator(fs::path(directory))) for (auto& entry : fs::directory_iterator(fs::u8path(directory)))
add_filtered(entry); add_filtered(entry);
} }
} }