Merge pull request #45 from mewlist/exceptions

Exceptions
mewlist · Feb 23, 2024 · 0591e98 · 0591e98
2 parents 6d01dad + ffe101e
commit 0591e98
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Runtime/Context/SceneContext.cs b/Runtime/Context/SceneContext.cs
@@ -131,6 +131,7 @@ await Task.WhenAll(injectableComponents.Select(x
                     await Shutdown();
                     return;
                 }
+                throw;
             }
             using (new ContextSpaceScope(this))
             {

diff --git a/Runtime/DIContainer.cs b/Runtime/DIContainer.cs
@@ -272,8 +272,16 @@ Component component
             if (go.GetComponent(typeof(IGameObjectContextRoot)))
                 return instance;
 
-            foreach (var component in go.GetComponentsInChildren(typeof(IInjectableComponent)))
-                await InjectIntoAsync(component, args);
+            try
+            {
+                foreach (var component in go.GetComponentsInChildren(typeof(IInjectableComponent)))
+                    await InjectIntoAsync(component, args);
+            }
+            catch (Exception e)
+            {
+                Object.Destroy(prefabInstance);
+                throw e;
+            }
 
             return instance;
         }