Fixed double key press issue

SubSystems will not be enabled/disabled multiple times now
BUTR · Jul 2, 2024 · ffba101 · ffba101
1 parent 73f6b49
commit ffba101
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 5 deletions.
diff --git a/build/common.props b/build/common.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <BaseGameVersion>1.0.0</BaseGameVersion>
     <!--Module Version-->
-    <Version>2.9.9</Version>
+    <Version>2.9.10</Version>
     <!--Harmony Version-->
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <HarmonyExtensionsVersion>3.2.0.77</HarmonyExtensionsVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.9.10
+Game Versions: v1.0.x,v1.1.x,v1.2.x
+* Fixed double key press issue
+---------------------------------------------------------------------------------------------------
 Version: 2.9.9
 Game Versions: v1.0.x,v1.1.x,v1.2.x
 * Fixed SyncAsJson not serializing game types

diff --git a/src/Bannerlord.ButterLib.Implementation/DistanceMatrix/DistanceMatrixSubSystem.cs b/src/Bannerlord.ButterLib.Implementation/DistanceMatrix/DistanceMatrixSubSystem.cs
@@ -25,16 +25,18 @@ public DistanceMatrixSubSystem()
 
     public void Enable()
     {
-        if (GameInitialized)
-            return;
+        if (IsEnabled) return;
+
+        if (GameInitialized) return;
 
         IsEnabled = true;
     }
 
     public void Disable()
     {
-        if (GameInitialized)
-            return;
+        if (!IsEnabled) return;
+
+        if (GameInitialized) return;
 
         IsEnabled = false;
     }

diff --git a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeySubSystem.cs b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeySubSystem.cs
@@ -33,6 +33,7 @@ public HotKeySubSystem()
 
     public void Enable()
     {
+        if (IsEnabled) return;
         IsEnabled = true;
 
         if (ButterLibSubModule.Instance is { } instance)
@@ -43,6 +44,7 @@ public void Enable()
 
     public void Disable()
     {
+        if (!IsEnabled) return;
         IsEnabled = false;
 
         if (ButterLibSubModule.Instance is { } instance)

diff --git a/...Bannerlord.ButterLib.Implementation/MBSubModuleBaseExtended/MBSubModuleBaseExSubSystem.cs b/...Bannerlord.ButterLib.Implementation/MBSubModuleBaseExtended/MBSubModuleBaseExSubSystem.cs
@@ -29,6 +29,7 @@ public MBSubModuleBaseExSubSystem()
     }
     public void Enable()
     {
+        if (IsEnabled) return;
         IsEnabled = true;
 
         ModulePatch.Enable(_harmony);
@@ -40,7 +41,9 @@ public void Enable()
     }
     public void Disable()
     {
+        if (!IsEnabled) return;
         IsEnabled = false;
+
         ModulePatch.Disable(_harmony);
         MBGameManagerPatch.Disable(_harmony);
         // Think about DelayedSubModuleManager.Unregister

diff --git a/src/Bannerlord.ButterLib.Implementation/ObjectSystem/ObjectSystemSubSystem.cs b/src/Bannerlord.ButterLib.Implementation/ObjectSystem/ObjectSystemSubSystem.cs
@@ -25,13 +25,15 @@ public ObjectSystemSubSystem()
 
     public void Enable()
     {
+        if (IsEnabled) return;
         IsEnabled = true;
 
         CampaignBehaviorManagerPatch.Enable(_harmony);
     }
 
     public void Disable()
     {
+        if (!IsEnabled) return;
         IsEnabled = false;
 
         CampaignBehaviorManagerPatch.Disable(_harmony);

diff --git a/src/Bannerlord.ButterLib.Implementation/SaveSystem/SaveSystemSubSystem.cs b/src/Bannerlord.ButterLib.Implementation/SaveSystem/SaveSystemSubSystem.cs
@@ -29,6 +29,7 @@ public SaveSystemSubSystem()
 
     public void Enable()
     {
+        if (IsEnabled) return;
         IsEnabled = true;
 
         BehaviourNamePatch.Enable(_harmony); // Fixes possible collision with save names
@@ -38,6 +39,7 @@ public void Enable()
 
     public void Disable()
     {
+        if (!IsEnabled) return;
         IsEnabled = false;
 
         BehaviourNamePatch.Disable(_harmony);

diff --git a/src/Bannerlord.ButterLib/CrashUploader/CrashUploaderSubSystem.cs b/src/Bannerlord.ButterLib/CrashUploader/CrashUploaderSubSystem.cs
@@ -21,11 +21,13 @@ public CrashUploaderSubSystem()
 
     public void Enable()
     {
+        if (IsEnabled) return;
         IsEnabled = true;
     }
 
     public void Disable()
     {
+        if (!IsEnabled) return;
         IsEnabled = false;
     }
 }
diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs b/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs
@@ -73,6 +73,7 @@ public ExceptionHandlerSubSystem()
 
     public void Enable()
     {
+        if (IsEnabled) return;
         IsEnabled = true;
 
         if (!BEWPatch.IsDebuggerAttached())
@@ -87,6 +88,7 @@ public void Enable()
 
     public void Disable()
     {
+        if (!IsEnabled) return;
         IsEnabled = false;
 
         UnsubscribeToUnhandledException();