From b210661ac8143b517658645828db1fec36aea07c Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 7 Feb 2020 20:53:41 +0100 Subject: [PATCH] Unlinker: Fix not attempting to load files from manually specified search paths --- src/Unlinker/Unlinker.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Unlinker/Unlinker.cpp b/src/Unlinker/Unlinker.cpp index 557b54b2..c2bc9776 100644 --- a/src/Unlinker/Unlinker.cpp +++ b/src/Unlinker/Unlinker.cpp @@ -231,7 +231,7 @@ class Unlinker::Impl return false; } - SearchPathFilesystem* searchPath = new SearchPathFilesystem(absolutePath); + auto* searchPath = new SearchPathFilesystem(absolutePath); LoadSearchPath(searchPath); m_search_paths.CommitSearchPath(searchPath); @@ -401,6 +401,7 @@ public: std::string absoluteZoneDirectory = absolute(std::filesystem::path(zonePath).remove_filename()).string(); SearchPaths searchPathsForZone = GetSearchPathsForZone(absoluteZoneDirectory); + searchPathsForZone.IncludeSearchPath(&m_search_paths); Zone* zone = ZoneLoading::LoadZone(zonePath); if (zone == nullptr)