zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 00:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unlinker: Fix not attempting to load files from manually specified search paths

Browse Source
This commit is contained in:
Jan 2020-02-07 20:53:41 +01:00
parent c2b28a54be
commit b210661ac8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Unlinker/Unlinker.cpp
View File

@ -231,7 +231,7 @@ class Unlinker::Impl
return false; return false;
} }
SearchPathFilesystem* searchPath = new SearchPathFilesystem(absolutePath); auto* searchPath = new SearchPathFilesystem(absolutePath);
LoadSearchPath(searchPath); LoadSearchPath(searchPath);
m_search_paths.CommitSearchPath(searchPath); m_search_paths.CommitSearchPath(searchPath);
@ -401,6 +401,7 @@ public:
std::string absoluteZoneDirectory = absolute(std::filesystem::path(zonePath).remove_filename()).string(); std::string absoluteZoneDirectory = absolute(std::filesystem::path(zonePath).remove_filename()).string();
SearchPaths searchPathsForZone = GetSearchPathsForZone(absoluteZoneDirectory); SearchPaths searchPathsForZone = GetSearchPathsForZone(absoluteZoneDirectory);
searchPathsForZone.IncludeSearchPath(&m_search_paths);
Zone* zone = ZoneLoading::LoadZone(zonePath); Zone* zone = ZoneLoading::LoadZone(zonePath);
if (zone == nullptr) if (zone == nullptr)