Fix: Error when an option menu is loaded on menu open (#480)

Fixed `InvalidOperationException` for menu options
SubnauticaModding · Oct 2, 2023 · 9eee31a · 9eee31a
1 parent 0c0c45c
commit 9eee31a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Nautilus/Options/Attributes/OptionsMenuBuilder.cs b/Nautilus/Options/Attributes/OptionsMenuBuilder.cs
@@ -151,7 +151,8 @@ public override void BuildModOptions(uGUI_TabbedControlsPanel panel, int modsTab
                 }
             }
         }
-        base.BuildModOptions(panel, modsTabIndex, Options);
+
+        base.BuildModOptions(panel, modsTabIndex, options);
     }
 
     /// <summary>

diff --git a/Nautilus/Options/ModOptions.cs b/Nautilus/Options/ModOptions.cs
@@ -63,7 +63,13 @@ public bool RemoveItem(string id)
 
     internal void AddOptionsToPanel(uGUI_TabbedControlsPanel panel, int modsTabIndex)
     {
-        BuildModOptions(panel, modsTabIndex, Options);
+        /*
+         * Since Subnautica runs on a very old CLR, iterating on a list that is changed in the loop throws an exception.
+         * To prevent the mistake of calling RemoveItem or AddItem while iterating on the Options property, we pass a copy of
+         * The Options property.
+         */ 
+        var options = Options.ToList();
+        BuildModOptions(panel, modsTabIndex, options);
     }
 
     /// <summary>
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
             }
-            base.BuildModOptions(panel, modsTabIndex, Options);
+            base.BuildModOptions(panel, modsTabIndex, options);
         }
         /// <summary>
@@ Expand Down @@