Fix error when loading surface from not yet loaded asset

2022-05-06 18:30:49 +02:00
parent 4cedd0f30c
commit 78d6fe6b50
9 changed files with 25 additions and 6 deletions
--- a/Source/Engine/Content/Assets/VisualScript.cpp
+++ b/Source/Engine/Content/Assets/VisualScript.cpp
@@ -2116,6 +2116,8 @@ const VisualScript::Field* VisualScript::FindField(const StringAnsiView& name) c

 BytesContainer VisualScript::LoadSurface()
 {
+    if (WaitForLoaded())
+        return BytesContainer();
    ScopeLock lock(Locker);
    if (!LoadChunks(GET_CHUNK_FLAG(0)))
    {
@@ -2124,7 +2126,6 @@ BytesContainer VisualScript::LoadSurface()
        result.Copy(data->Data);
        return result;
    }
-
    LOG(Warning, "\'{0}\' surface data is missing.", ToString());
    return BytesContainer();
 }