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

Fixed a crash when searching recursively through a directory.

Browse source
This commit is contained in:
Leon Styhre 2020-11-10 22:16:30 +01:00
parent 0bb8737211
commit cc87084959
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

@ -73,10 +73,12 @@ namespace Utils
std::string fullName(getGenericPath(path + "/" + name)); std::string fullName(getGenericPath(path + "/" + name));
contentList.push_back(fullName); contentList.push_back(fullName);
if (_recursive && isDirectory(fullName)) if (_recursive && isDirectory(fullName)) {
contentList.sort();
contentList.merge(getDirContent(fullName, true)); contentList.merge(getDirContent(fullName, true));
} }
} }
}
while (FindNextFileW(hFind, &findData)); while (FindNextFileW(hFind, &findData));
FindClose(hFind); FindClose(hFind);
} }
@ -94,10 +96,12 @@ namespace Utils
std::string fullName(getGenericPath(path + "/" + name)); std::string fullName(getGenericPath(path + "/" + name));
contentList.push_back(fullName); contentList.push_back(fullName);
if (_recursive && isDirectory(fullName)) if (_recursive && isDirectory(fullName)) {
contentList.sort();
contentList.merge(getDirContent(fullName, true)); contentList.merge(getDirContent(fullName, true));
} }
} }
}
closedir(dir); closedir(dir);
} }
#endif #endif