Merge pull request #418 from hadashiA/ku/fix-root-configure-timing

Fix root startup timing due to undefined behavior before scene load
hadashiA · Sep 26, 2022 · 030c13e · 030c13e · vercel · Sep 26, 2022
2 parents 364b502 + ee4fc3e
commit 030c13e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/VContainer/Assets/VContainer/Runtime/Unity/InstanceProviders/NewGameObjectProvider.cs b/VContainer/Assets/VContainer/Runtime/Unity/InstanceProviders/NewGameObjectProvider.cs
@@ -48,4 +48,4 @@ public object SpawnInstance(IObjectResolver resolver)
             return component;
         }
     }
-}
+}
diff --git a/VContainer/Assets/VContainer/Runtime/Unity/VContainerSettings.cs b/VContainer/Assets/VContainer/Runtime/Unity/VContainerSettings.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 namespace VContainer.Unity
 {
@@ -71,24 +72,42 @@ void OnEnable()
                 if (RootLifetimeScope != null)
                 {
                     RootLifetimeScope.IsRoot = true;
-                    if (RootLifetimeScope.Container == null && RootLifetimeScope.autoRun)
-                    {
-                        RootLifetimeScope.Build();
-                    }
                 }
 
                 Instance = this;
+
+                var activeScene = SceneManager.GetActiveScene();
+                if (activeScene.isLoaded)
+                {
+                    OnFirstSceneLoaded(activeScene, default);
+                }
+                else
+                {
+                    SceneManager.sceneLoaded -= OnFirstSceneLoaded;
+                    SceneManager.sceneLoaded += OnFirstSceneLoaded;
+                }
+
                 Application.quitting -= OnApplicationQuit;
                 Application.quitting += OnApplicationQuit;
             }
         }
 
+        void OnFirstSceneLoaded(Scene scene, LoadSceneMode mode)
+        {
+            if (RootLifetimeScope != null &&
+                RootLifetimeScope.Container == null &&
+                RootLifetimeScope.autoRun)
+            {
+                RootLifetimeScope.Build();
+            }
+            SceneManager.sceneLoaded -= OnFirstSceneLoaded;
+        }
+
         void OnApplicationQuit()
         {
             if (RootLifetimeScope != null)
             {
-                var container = RootLifetimeScope.Container;
-                if (container != null)
+                if (RootLifetimeScope.Container != null)
                 {
                     // Execute Dispose once at the slowest possible time.
                     // However, the GameObject may be destroyed at that time.