Merge pull request #31 from mewlist/through-already-unloaded-scene-ref

Pass to unlaod already unloaded scene reference
mewlist · Feb 23, 2024 · 1cabd20 · 1cabd20
2 parents 406d0ad + a8b2f78
commit 1cabd20
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/Runtime/Assets/Scene/UnifiedSceneLoader.cs b/Runtime/Assets/Scene/UnifiedSceneLoader.cs
@@ -7,6 +7,7 @@
 
 #if USE_MEW_CORE_ASSETS
 using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.ResourceProviders;
 #endif
 
 #if UNITY_EDITOR
@@ -71,8 +72,19 @@ public static async ValueTask UnloadAsync(ISceneHandle targetHandle)
 #if USE_MEW_CORE_ASSETS
                 case SceneInstanceHandle sceneInstanceHandle:
                 {
+                    SceneInstance sceneInstance;
+                    try
+                    {
+                        sceneInstance = sceneInstanceHandle.Handle.Result;
+                    }
+                    catch (Exception)
+                    {
+                        // Scene is already unloaded
+                        return;
+                    }
+
                     var handle = Addressables.UnloadSceneAsync(
-                        sceneInstanceHandle.Handle.Result,
+                        sceneInstance,
                         UnloadSceneOptions.UnloadAllEmbeddedSceneObjects,
                         true);
                     await handle.Task;