From a59444c43cc5b964fe6bef5f6aa787c959a87a50 Mon Sep 17 00:00:00 2001
From: appaKappaK <ballsmj3@pm.me>
Date: Sat, 16 May 2026 06:27:50 -0400
Subject: [PATCH] Fix TSTMstStgs settings callback leak

---
 TarsierSpaceTechnology/TarsierSpaceTech/TSTSettings.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/TarsierSpaceTechnology/TarsierSpaceTech/TSTSettings.cs b/TarsierSpaceTechnology/TarsierSpaceTech/TSTSettings.cs
index 0588908..52e58d1 100644
--- a/TarsierSpaceTechnology/TarsierSpaceTech/TSTSettings.cs
+++ b/TarsierSpaceTechnology/TarsierSpaceTech/TSTSettings.cs
@@ -109,6 +109,8 @@ public void Update()
 
         public void OnDestroy()
         {
+            GameEvents.OnGameSettingsApplied.Remove(ApplySettings);
+
             TSTsettings.Save(globalNode);
             TSTstockplanets.Save(globalNode);
             TSTrssplanets.Save(globalNode);
@@ -116,7 +118,11 @@ public void OnDestroy()
             TSTnhplanets.Save(globalNode);
             globalNode.Save(globalConfigFilename);
             Utilities.Log_Debug("TSTMstStgs OnSave: \n {0}" , globalNode.ToString());
-            GameEvents.OnGameSettingsApplied.Add(ApplySettings);
+
+            if (Instance == this)
+            {
+                Instance = null;
+            }
         }
 
         private void ApplySettings()
@@ -520,4 +526,4 @@ public void Save(ConfigNode node)
             Utilities.Log_Debug("TSTNHPlanetOrder save complete");
         }
     }
-}
\ No newline at end of file
+}