Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Sort files in CFileContainer::addSearchPath too

Browse source
This commit is contained in:
kervala 2015-03-02 13:13:26 +01:00
parent b34e10adb4
commit 2e7e46b8f9
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/src/misc/path.cpp
View file

@ -1033,6 +1033,9 @@ void CFileContainer::addSearchPath (const string &path, bool recurse, bool alter
{ {
// find all path and subpath // find all path and subpath
getPathContent (newPath, recurse, true, false, pathsToProcess, progressCallBack); getPathContent (newPath, recurse, true, false, pathsToProcess, progressCallBack);
// sort files
sort(pathsToProcess.begin(), pathsToProcess.end());
} }
for (uint p = 0; p < pathsToProcess.size(); p++) for (uint p = 0; p < pathsToProcess.size(); p++)
@ -1078,7 +1081,10 @@ void CFileContainer::addSearchPath (const string &path, bool recurse, bool alter
// find all files in the path and subpaths // find all files in the path and subpaths
getPathContent (newPath, recurse, false, true, filesToProcess, progressCallBack); getPathContent (newPath, recurse, false, true, filesToProcess, progressCallBack);
// Progree bar // sort files
sort(filesToProcess.begin(), filesToProcess.end());
// Progress bar
if (progressCallBack) if (progressCallBack)
{ {
progressCallBack->popCropedValues (); progressCallBack->popCropedValues ();