Merge remote-tracking branch 'origin/master' into 1.9

2024-08-16 14:52:57 +02:00
parent b1127f2e05 d779862271
commit 21b4c7c916
47 changed files with 345 additions and 96 deletions
--- a/Source/Engine/Content/Storage/FlaxStorage.cpp
+++ b/Source/Engine/Content/Storage/FlaxStorage.cpp
@@ -662,13 +662,13 @@ bool FlaxStorage::LoadAssetChunk(FlaxChunk* chunk)
                if (!failed)
                {
                    stream->SetPosition(chunk->LocationInFile.Address);
+                    if (!stream->HasError())
+                        break;
                }
-                if (!stream->HasError())
-                    break;
            }
        }

-        if (stream->HasError())
+        if (!stream || stream->HasError())
        {
            failed = true;
            UnlockChunks();