fix: exception when scene is unloaded

Closes: #436
bdunderscore · Oct 5, 2024 · 68ec75f · 68ec75f
1 parent a606812
commit 68ec75f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Editor/PreviewSystem/Rendering/NDMFPreviewSceneManager.cs b/Editor/PreviewSystem/Rendering/NDMFPreviewSceneManager.cs
@@ -62,7 +62,7 @@ private static void Init()
                     for (var i = 0; i < sceneCount; i++)
                     {
                         var scene = SceneManager.GetSceneAt(i);
-                        if (scene == _previewScene) continue;
+                        if (scene == _previewScene || !scene.isLoaded || !scene.IsValid()) continue;
 
                         SceneManager.SetActiveScene(scene);
                         found = true;
@@ -71,7 +71,7 @@ private static void Init()
 
                     if (!found)
                     {
-                        // Unload the preview scene if it's the only one left
+                        // Unload the preview scene if it's the only valid/loaded scene left
                         EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects);
 
                         ResetPreviewScene();