diff options
| author | LC <mathew1800@gmail.com> | 2020-12-09 17:25:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 17:25:09 -0500 |
| commit | 4e94d0d53af2cdb7b03ef9de23cc29f3565df97a (patch) | |
| tree | 727c431f6ee60371ca403376c917ed25f6c52aa7 /src/common/file_util.cpp | |
| parent | 6d6115475b4edccdf1bb4e96ecc3d3b1be319e76 (diff) | |
| parent | bab9cae71f5cd5a0078853e64bdf1d1f8af1fc30 (diff) | |
Merge pull request #5179 from ReinUsesLisp/fs-path
common/file_util: Let std::filesystem cast from UTF16 to std::string
Diffstat (limited to 'src/common/file_util.cpp')
| -rw-r--r-- | src/common/file_util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 7752c04213..a286b93412 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -239,7 +239,7 @@ bool ForeachDirectoryEntry(u64* num_entries_out, const std::string& directory, } // windows loop do { - const std::string virtual_name(Common::UTF16ToUTF8(ffd.cFileName)); + const std::string virtual_name = std::filesystem::path(ffd.cFileName).string(); #else DIR* dirp = opendir(directory.c_str()); if (!dirp) |