Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Windows) Fixed an issue where Unicode characters in folder names would sometimes crash the application

Browse source
This commit is contained in:
Leon Styhre 2023-10-17 23:58:38 +02:00
parent 436d21ec92
commit 78a4223b8e
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
es-core/src/utils/FileSystemUtil.cpp
View file

@ -71,21 +71,25 @@ namespace Utils
return contentList; return contentList;
if (recursive) { if (recursive) {
for (auto& entry : std::filesystem::recursive_directory_iterator(genericPath)) {
#if defined(_WIN64) #if defined(_WIN64)
for (auto& entry : std::filesystem::recursive_directory_iterator(
Utils::String::stringToWideString(genericPath))) {
contentList.emplace_back( contentList.emplace_back(
Utils::String::wideStringToString(entry.path().generic_wstring())); Utils::String::wideStringToString(entry.path().generic_wstring()));
#else #else
for (auto& entry : std::filesystem::recursive_directory_iterator(genericPath)) {
contentList.emplace_back(entry.path().generic_string()); contentList.emplace_back(entry.path().generic_string());
#endif #endif
} }
} }
else { else {
for (auto& entry : std::filesystem::directory_iterator(genericPath)) {
#if defined(_WIN64) #if defined(_WIN64)
for (auto& entry : std::filesystem::directory_iterator(
Utils::String::stringToWideString(genericPath))) {
contentList.emplace_back( contentList.emplace_back(
Utils::String::wideStringToString(entry.path().generic_wstring())); Utils::String::wideStringToString(entry.path().generic_wstring()));
#else #else
for (auto& entry : std::filesystem::directory_iterator(genericPath)) {
contentList.emplace_back(entry.path().generic_string()); contentList.emplace_back(entry.path().generic_string());
#endif #endif
} }