bugfix, run a tas with a save state twice, then hotkeys failed and even game crash, due to SimplifiedSpinner.OnLevelAddEntity, EntityList.ToAdd can be null

Author: LozenChen

Entities/SimplifiedSpinner.cs

@@ -115,7 +115,7 @@ private static void OnLoadLevel(On.Celeste.Level.orig_LoadLevel orig, Level self
 
     private static void OnLevelAddEntity(On.Monocle.EntityList.orig_UpdateLists orig, EntityList self) {
         if (self.Scene is Level) {
-            AddingEntities |= self.ToAdd.Count > 0;
+            AddingEntities |= self.ToAdd is { } var && var.Count > 0;
         }
         orig(self);
     }

Module/TASHelperModule.cs

@@ -12,14 +12,12 @@ public TASHelperModule() {
 
     public override Type SettingsType => typeof(TASHelperSettings);
     public override void Load() {
-        On.Monocle.MInput.Update += HotkeysSaveSettings;
         On.Celeste.Level.Render += HotkeysPressed;
         Loader.HelperLoad();
         Loader.EntityLoad();
     }
 
     public override void Unload() {
-        On.Monocle.MInput.Update -= HotkeysSaveSettings;
         On.Celeste.Level.Render -= HotkeysPressed;
         Loader.HelperUnload();
         Loader.EntityUnload();
@@ -45,21 +43,11 @@ public override void CreateModMenuSection(TextMenu menu, bool inGame, EventInsta
         TASHelperMenu.CreateMenu(this, menu, inGame);
     }
 
-
-    private static void HotkeysSaveSettings(On.Monocle.MInput.orig_Update orig) {
-        orig();
-        if (TASHelperSettings.hotkeysPressed) {
-            Instance.SaveSettings();
-            TASHelperSettings.hotkeysPressed = false;
-        }
-        // some part of MInput_Update is taken over by CelesteTAS, in that case orig() will not be called
-        // so we can't press hotkeys here
-    }
-
     private static void HotkeysPressed(On.Celeste.Level.orig_Render orig, Level self) {
         orig(self);
-        TASHelperSettings.hotkeysPressed = TasHelperSettings.SettingsHotkeysPressed();
-        // if you call Instance.SaveSettings() here, then the game will crash if you open Menu-Mod Options in a Level and close the menu.
+        if (TasHelperSettings.SettingsHotkeysPressed()) {
+            Instance.SaveSettings();
+        }
     }
 }
 

Module/TASHelperSettings.cs

@@ -3,8 +3,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
 using Monocle;
-using System.Collections.Generic;
-using System.Linq;
 using TAS.EverestInterop;
 using static Celeste.Mod.TASHelper.Module.TASHelperSettings;
 using static TAS.EverestInterop.Hotkeys;
@@ -442,7 +440,6 @@ public ButtonBinding KeyPixelGridWidth {
 
     private List<Hotkey> Hotkeys = new();
 
-    internal static bool hotkeysPressed = false;
     public bool SettingsHotkeysPressed() {
         if (Engine.Scene is not Level level) {
             return false;
@@ -474,7 +471,7 @@ public bool SettingsHotkeysPressed() {
                         MainSwitch = MainSwitchThreeStates ? MainSwitchModes.OnlyDefault : MainSwitchModes.AllowAll;
                         break;
                     }
-                    // it may happen that MainSwitchThreeStates = false but MainSwitch = OnlyDefault... it's ok
+                // it may happen that MainSwitchThreeStates = false but MainSwitch = OnlyDefault... it's ok
                 case MainSwitchModes.OnlyDefault: MainSwitch = MainSwitchModes.AllowAll; break;
                 case MainSwitchModes.AllowAll: MainSwitch = MainSwitchModes.Off; break;
             }