Merge pull request #314 from Aragas/dev

v5.1.1
Aragas · Nov 10, 2022 · 4252b26 · 4252b26
2 parents d6e0769 + e2d5c37
commit 4252b26
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/build/common.props b/build/common.props
@@ -3,11 +3,11 @@
 
   <PropertyGroup>
     <GameVersion>1.0.0</GameVersion>
-    <Version>5.1.0</Version>
+    <Version>5.1.1</Version>
     <HarmonyVersion>2.2.2</HarmonyVersion>
-    <ButterLibVersion>2.5.0</ButterLibVersion>
+    <ButterLibVersion>2.5.1</ButterLibVersion>
     <UIExtenderExVersion>2.3.1</UIExtenderExVersion>
-    <BuildResourcesVersion>1.0.1.68</BuildResourcesVersion>
+    <BuildResourcesVersion>1.0.1.80</BuildResourcesVersion>
     <BUTRSharedVersion>3.0.0.121</BUTRSharedVersion>
     <BUTRDependencyInjectionVersion>1.0.0.30</BUTRDependencyInjectionVersion>
     <BUTRModuleManagerVersion>4.0.149</BUTRModuleManagerVersion>
@@ -73,4 +73,4 @@
     <PackageReference Include="BUTR.Harmony.Analyzer" Version="$(HarmonyAnalyzerVersion)" PrivateAssets="all" IncludeAssets="contentfiles"/>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 5.1.1
+Game Versions: v1.0.0,v1.0.1
+* Updated ButterLib
+---------------------------------------------------------------------------------------------------
 Version: 5.1.0
 Game Versions: v1.0.0,v1.0.1
 * Made the Mod Options dynamic, changing the language will change the localization correctly

diff --git a/src/MCM.UI/MCMUISubModule.cs b/src/MCM.UI/MCMUISubModule.cs
@@ -26,8 +26,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
-using SandBox;
-
 using System;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
@@ -120,10 +118,14 @@ protected override void OnSubModuleLoad()
             var optionsSwitchHarmony = new Harmony("bannerlord.mcm.ui.optionsswitchpatch");
             OptionsVMPatch.Patch(optionsSwitchHarmony);
 
+            var calledDelayedOnce = false;
             var type = AccessTools2.TypeByName("SandBox.SandBoxSubModule");
             DelayedSubModuleManager.Register(type);
             DelayedSubModuleManager.Subscribe(type, this, nameof(OnSubModuleLoad), SubscriptionType.AfterMethod, (_, _) =>
             {
+                if (calledDelayedOnce) return;
+                calledDelayedOnce = true;
+
                 Extender.Register(typeof(MCMUISubModule).Assembly);
                 Extender.Enable();
             });
@@ -142,10 +144,14 @@ protected override void OnBeforeInitialModuleScreenSetAsRoot()
                     Logger = this.GetServiceProvider().GetRequiredService<ILogger<MCMUISubModule>>();
                 }
 
+                var calledDelayedOnce = false;
                 var type = AccessTools2.TypeByName("SandBox.SandBoxSubModule");
                 DelayedSubModuleManager.Register(type);
                 DelayedSubModuleManager.Subscribe(type, this, nameof(OnBeforeInitialModuleScreenSetAsRoot), SubscriptionType.AfterMethod, (_, _) =>
                 {
+                    if (calledDelayedOnce) return;
+                    calledDelayedOnce = true;
+
                     var resourceInjector = GenericServiceProvider.GetService<ResourceInjector>();
                     resourceInjector?.Inject();
 
@@ -165,12 +171,15 @@ protected override void OnSubModuleUnloaded()
         {
             base.OnSubModuleUnloaded();
 
+            var calledDelayedOnce = false;
             var type = AccessTools2.TypeByName("SandBox.SandBoxSubModule");
             DelayedSubModuleManager.Register(type);
             DelayedSubModuleManager.Subscribe(type, this, nameof(OnSubModuleUnloaded), SubscriptionType.AfterMethod, (_, _) =>
             {
-                var instance = MCMUISettings.Instance;
-                if (instance is not null)
+                if (calledDelayedOnce) return;
+                calledDelayedOnce = true;
+
+                if (MCMUISettings.Instance is { } instance)
                     instance.PropertyChanged -= MCMSettings_PropertyChanged;
             });
         }