From 65eb11cb56ec5425cdbab7a7536b168a82e4b815 Mon Sep 17 00:00:00 2001 From: briaguya <70942617+briaguya0@users.noreply.github.com> Date: Sat, 25 Jul 2026 22:30:20 -0400 Subject: Fix three Windows-only defects in OoT extraction (#234) --- src/Companion.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/Companion.cpp') diff --git a/src/Companion.cpp b/src/Companion.cpp index 74d6ec1..bb58dcf 100644 --- a/src/Companion.cpp +++ b/src/Companion.cpp @@ -536,7 +536,7 @@ void Companion::ParseCurrentFileConfig(YAML::Node node, std::atomic& ass auto externalFile = externalFiles[i]; if (externalFile.size() == 0) { this->gCurrentExternalFiles.push_back( - (this->gSourceDirectory / externalFile.as()).string()); + (this->gSourceDirectory / externalFile.as()).generic_string()); } else { SPDLOG_INFO("External File size {}", externalFile.size()); throw std::runtime_error( @@ -544,9 +544,10 @@ void Companion::ParseCurrentFileConfig(YAML::Node node, std::atomic& ass " - \n\ne.g.:\nexternal_files:\n - actors/actor1.yaml"); } - std::string externalFileName = (this->gSourceDirectory / externalFile.as()).string(); - if (StringHelper::StartsWith(std::filesystem::relative(externalFileName, this->gAssetPath).string(), - "../")) { + std::string externalFileName = + (this->gSourceDirectory / externalFile.as()).generic_string(); + if (StringHelper::StartsWith( + std::filesystem::relative(externalFileName, this->gAssetPath).generic_string(), "../")) { throw std::runtime_error("External File " + externalFileName + " Not In Asset Directory " + this->gAssetPath); } else if (std::filesystem::relative(externalFileName, this->gAssetPath).string() == "") { -- cgit v1.2.3