indexoutofrange exception after stopping game fixed & function renamed

somedeveloper00 · Jul 28, 2023 · 1bbcc5f · 1bbcc5f
1 parent 037692c
commit 1bbcc5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/BContextList.cs b/BContextList.cs
@@ -20,7 +20,7 @@ void Init() {
         }
 
         [MethodImpl( MethodImplOptions.AggressiveInlining )]
-        public BContext GetRoot() => this[RootIndex];
+        public BContext GetRoot() => RootIndex >= Count ? this[0] : this[RootIndex];
 
         public new void Add(BContext context) {
             base.Add( context );

diff --git a/BinjectManager.cs b/BinjectManager.cs
@@ -253,9 +253,9 @@ internal static void UpdateAllRootContextsAndTopmostScene() {
 #if B_DEBUG
                 bool changed = false;
 #endif
-                rootOrder = GetHierarchyOrder( contexts.GetRoot().transform, stack );
+                rootOrder = CalculateHierarchyOrder( contexts.GetRoot().transform, stack );
                 for (int i = 0; i < contexts.Count; i++) {
-                    var order = GetHierarchyOrder( contexts[i].transform, stack );
+                    var order = CalculateHierarchyOrder( contexts[i].transform, stack );
                     if (order < rootOrder) {
                         rootOrder = order;
                         contexts.RootIndex = i;
@@ -292,12 +292,12 @@ internal static void UpdateAllRootContextsAndTopmostScene() {
 
             foreach (var contexts in _groupedContexts.Values) {
                 const int SCENE_BENEFIT = 1_000_000;
-                rootOrder = GetHierarchyOrder( contexts.GetRoot().transform, stack ) * sceneOrder[contexts.GetRoot().gameObject.scene] * SCENE_BENEFIT;
+                rootOrder = CalculateHierarchyOrder( contexts.GetRoot().transform, stack ) * sceneOrder[contexts.GetRoot().gameObject.scene] * SCENE_BENEFIT;
 #if B_DEBUG
                 bool changed = false;   
 #endif
                 for (int i = 0; i < contexts.Count; i++) {
-                    var order = GetHierarchyOrder( contexts[i].transform, stack ) * sceneOrder[contexts[i].gameObject.scene] * SCENE_BENEFIT;
+                    var order = CalculateHierarchyOrder( contexts[i].transform, stack ) * sceneOrder[contexts[i].gameObject.scene] * SCENE_BENEFIT;
                     if (order < rootOrder) {
                         rootOrder = order;
                         contexts.RootIndex = i;
@@ -324,7 +324,7 @@ internal static void UpdateAllRootContextsAndTopmostScene() {
         /// the <see cref="stack"/> has to be empty but initialized.
         /// </summary>
         [MethodImpl( MethodImplOptions.AggressiveInlining )]
-        static int GetHierarchyOrder(Transform transform, Stack<Transform> stack) {
+        static int CalculateHierarchyOrder(Transform transform, Stack<Transform> stack) {
             do {
                 stack.Push( transform );
                 transform = transform.parent;