Fixed Warning screen return

BUTR · Mar 19, 2022 · b6a6a27 · b6a6a27
1 parent 1f558b5
commit b6a6a27
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/build/common.props b/build/common.props
@@ -3,7 +3,7 @@
 
   <!--Development Variables-->
   <PropertyGroup>
-    <Version>1.7.5</Version>
+    <Version>1.7.6</Version>
     <HarmonyVersion>2.0.4</HarmonyVersion>
     <BUTRSharedVersion>2.0.0.78</BUTRSharedVersion>
     <BUTRModuleManagerVersion>3.0.94</BUTRModuleManagerVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.7.6
+Game Versions: e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9,e1.5.10,e1.6.0,e1.6.1,e1.6.2,e1.6.3,e1.6.4,e1.6.5,e1.7.0,e1.7.1,e1.7.2
+* Fixed Warning screen return
+---------------------------------------------------------------------------------------------------
 Version: 1.7.5
 Game Versions: e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9,e1.5.10,e1.6.0,e1.6.1,e1.6.2,e1.6.3,e1.6.4,e1.6.5,e1.7.0,e1.7.1,e1.7.2
 * Fixed additional crash at launch when an incompatible module is used

diff --git a/src/Bannerlord.BUTRLoader.LauncherEx/Patches/LauncherConfirmStartVMPatch.cs b/src/Bannerlord.BUTRLoader.LauncherEx/Patches/LauncherConfirmStartVMPatch.cs
@@ -17,7 +17,14 @@ public static bool Enable(Harmony harmony)
             var res1 = harmony.TryPatch(
                 AccessTools2.Method(LauncherConfirmStartVMType!, "EnableWith"),
                 prefix: AccessTools2.Method(typeof(LauncherConfirmStartVMPatch), nameof(EnableWithPrefix)));
-            if (!res1) return false;
+            if (!res1)
+            {
+                var res2 = harmony.TryPatch(
+                    AccessTools2.Method(LauncherConfirmStartVMType!, "EnableWith"),
+                    prefix: AccessTools2.Method(typeof(LauncherConfirmStartVMPatch), nameof(EnableWithPrefix2)));
+                if (!res2)
+                    return false;
+            }
 
             return true;
         }
@@ -27,5 +34,10 @@ public static bool EnableWithPrefix(Action? ___onConfirm)
             ___onConfirm?.Invoke();
             return false;
         }
+        public static bool EnableWithPrefix2(Action? ____onConfirm)
+        {
+            ____onConfirm?.Invoke();
+            return false;
+        }
     }
 }