-Added OnClose() Function to ModSetingsMenu

-Fixed an index out of range exception
PULSAR-Modders · Jan 14, 2022 · e039609 · e039609
1 parent 2c4a0dc
commit e039609
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/PulsarModLoader/CustomGUI/GUIMain.cs b/PulsarModLoader/CustomGUI/GUIMain.cs
@@ -126,24 +126,27 @@ void WindowFunction(int WindowID)
                         {
                             if (selectedSettings == ushort.MaxValue)
                             {
-                                var length = settings.Count;
-                                for (ushort msm = 0; msm < length; msm++)
+                                for (ushort msm = 0; msm < settings.Count; msm++)
                                 {
-                                    var FSettings = settings[msm];
-                                    if (Button(FSettings.Name()))
+                                    if (Button(settings[msm].Name()))
                                     {
-                                        selectedSettings = msm;
                                         settings[msm].OnOpen();
+                                        selectedSettings = msm;
                                         break;
                                     }
                                 }
                             }
                             else
                             {
                                 if (Button("Back"))
+                                {
+                                    settings[selectedSettings].OnClose();
                                     selectedSettings = ushort.MaxValue;
-
-                                settings[selectedSettings].Draw();
+                                }
+                                else
+                                {
+                                    settings[selectedSettings].Draw();
+                                }
                             }
                         }
                         EndScrollView();

diff --git a/PulsarModLoader/CustomGUI/ModSettingsMenu.cs b/PulsarModLoader/CustomGUI/ModSettingsMenu.cs
@@ -5,5 +5,6 @@ public abstract class ModSettingsMenu
         public abstract string Name();
         public abstract void Draw();
         public virtual void OnOpen() { }
+        public virtual void OnClose() { }
     }
 }