Fixed prefab instatiation with Configurable Enter Play Mode

Mathijs-Bakker · Feb 16, 2022 · 7ba9fcf · 7ba9fcf
1 parent e8af9a1
commit 7ba9fcf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/UnityProject/Assets/Plugins/Zenject/Source/Runtime/Util/ZenUtilInternal.cs b/UnityProject/Assets/Plugins/Zenject/Source/Runtime/Util/ZenUtilInternal.cs
@@ -262,7 +262,9 @@ public static IEnumerable<GameObject> GetRootGameObjects(Scene scene)
         // without any of their Awake() methods firing.
         public static Transform GetOrCreateInactivePrefabParent()
         {
-            if(_disabledIndestructibleGameObject == null || (!Application.isPlaying && _disabledIndestructibleGameObject.scene != SceneManager.GetActiveScene()))
+            if(_disabledIndestructibleGameObject == null ||
+                (!Application.isPlaying && _disabledIndestructibleGameObject.scene != SceneManager.GetActiveScene()) ||
+                !_disabledIndestructibleGameObject.scene.isLoaded)
             {
                 var go = new GameObject("ZenUtilInternal_PrefabParent");
                 go.hideFlags = HideFlags.HideAndDontSave;