From ebf2b0a2f3b0b3ab4723cfdd76f9273fab6a8216 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 26 Mar 2021 22:24:44 +0100 Subject: [PATCH] Fix asset path used in registry #394 --- Source/Engine/Content/Content.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Engine/Content/Content.cpp b/Source/Engine/Content/Content.cpp index 4b1e32f16..493147355 100644 --- a/Source/Engine/Content/Content.cpp +++ b/Source/Engine/Content/Content.cpp @@ -408,16 +408,20 @@ Asset* Content::LoadAsync(const StringView& path, MClass* type) Asset* Content::LoadAsync(const StringView& path, const ScriptingTypeHandle& type) { + // Ensure path is in a valid format + String pathNorm(path); + FileSystem::NormalizePath(pathNorm); + #if USE_EDITOR - if (!FileSystem::FileExists(path)) + if (!FileSystem::FileExists(pathNorm)) { - LOG(Error, "Missing file \'{0}\'", path); + LOG(Error, "Missing file \'{0}\'", pathNorm); return nullptr; } #endif AssetInfo assetInfo; - if (GetAssetInfo(path, assetInfo)) + if (GetAssetInfo(pathNorm, assetInfo)) { return LoadAsync(assetInfo.ID, type); }