From b9c2fdedd17d36aa91d7bcd9dd7112ce04a46f81 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 8 Sep 2018 22:17:21 +0100 Subject: [PATCH] Resolve absolute path when indexing files This ensures scenarios are displayed with their full path in the scenario select window rather than as specified in config or command line. --- src/openrct2/core/FileIndex.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/openrct2/core/FileIndex.hpp b/src/openrct2/core/FileIndex.hpp index 761f90af42..f6f03a7b78 100644 --- a/src/openrct2/core/FileIndex.hpp +++ b/src/openrct2/core/FileIndex.hpp @@ -146,9 +146,10 @@ private: std::vector files; for (const auto& directory : SearchPaths) { - log_verbose("FileIndex:Scanning for %s in '%s'", _pattern.c_str(), directory.c_str()); + auto absoluteDirectory = Path::GetAbsolute(directory); + log_verbose("FileIndex:Scanning for %s in '%s'", _pattern.c_str(), absoluteDirectory.c_str()); - auto pattern = Path::Combine(directory, _pattern); + auto pattern = Path::Combine(absoluteDirectory, _pattern); auto scanner = Path::ScanDirectory(pattern, true); while (scanner->Next()) {