Merge pull request #560 from CesiumGS/fix-reloading-crash

Fix crash resulting from GameObject being deleted before load thread finishes

Author: kring

CHANGES.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## ? - ?
+
+##### Fixes :wrench:
+
+- Fixed a bug that could cause a crash when reloading a scene or tileset repeatedly.
+
 ## v1.15.4 - 2025-03-03
 
 ##### Fixes :wrench:

native~/Runtime/src/UnityPrepareRendererResources.cpp

@@ -920,6 +920,15 @@ UnityPrepareRendererResources::prepareInLoadThread(
       .thenInMainThread(
           [asyncSystem, tileset = this->_tilesetGameObject](
               IntermediateLoadThreadResult&& workerResult) mutable {
+            if (tileset == nullptr) {
+              // Tileset GameObject was deleted while we were loading a tile
+              // (possibly play mode was exited or another cause).
+              return asyncSystem.createResolvedFuture(
+                  TileLoadResultAndRenderResources{
+                      std::move(workerResult.tileLoadResult),
+                      nullptr});
+            }
+
             bool shouldCreatePhysicsMeshes = false;
             bool shouldShowTilesInHierarchy = false;