Skip to content

fix: prevent BUTRInputManager orphan crash on game v1.4.4+ #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
w1r3dh4ck3r wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: prevent BUTRInputManager orphan crash on game v1.4.4+ #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/Bannerlord.LauncherEx/Patches/LauncherUIPatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Bannerlord.LauncherEx.Helpers;
using Bannerlord.LauncherEx.Helpers;

using HarmonyLib;
using HarmonyLib.BUTR.Extensions;
Expand All @@ -23,16 +23,20 @@ public static bool Enable(Harmony harmony)
postfix: AccessTools2.DeclaredMethod(typeof(LauncherUIPatch), nameof(InitializePostfix)));
if (!res1) return false;

var res2 = harmony.TryPatch(
AccessTools2.DeclaredMethod(typeof(LauncherUI), "Update"),
postfix: AccessTools2.DeclaredMethod(typeof(LauncherUIPatch), nameof(UpdatePostfix)));
if (!res2) return false;

// Patch the cleanup point before installing BUTRInputManager.
// If LauncherUI.AdditionalArgs was removed or renamed in this game version,
// installing BUTRInputManager without a cleanup path would leave it active
// when the game starts, causing a native crash (e.g. at GauntletVideoPlaybackScreen).
var res3 = harmony.TryPatch(
AccessTools2.DeclaredPropertyGetter(typeof(LauncherUI), "AdditionalArgs"),
postfix: AccessTools2.DeclaredMethod(typeof(LauncherUIPatch), nameof(AdditionalArgsPostfix)));
if (!res3) return false;

var res2 = harmony.TryPatch(
AccessTools2.DeclaredMethod(typeof(LauncherUI), "Update"),
postfix: AccessTools2.DeclaredMethod(typeof(LauncherUIPatch), nameof(UpdatePostfix)));
if (!res2) return false;

return true;
}

Expand Down