Skip to content

WineFix: gate MainWindowLoaded patch behind a setting, default off (mitigates #46) #56

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
bluejorts wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

WineFix: gate MainWindowLoaded patch behind a setting, default off (mitigates #46) #56

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: 14 additions & 2 deletions WineFix/WineFixPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class WineFixPlugin : AffinityPlugin
public const string SettingWidenStubFix = "widen_stub_fix";
public const string SettingBezierSplitGuard = "bezier_split_guard";
public const string SettingCommandLineFileOpen = "command_line_file_open";
public const string SettingMainWindowLoadedFix = "main_window_loaded_fix";

public override PluginSettingsDefinition DefineSettings()
{
Expand Down Expand Up @@ -69,6 +70,10 @@ public override PluginSettingsDefinition DefineSettings()
defaultValue: true,
restartRequired: true,
description: "Fix opening files from the command line or desktop file manager.")
.AddBool(SettingMainWindowLoadedFix, "Preferences saving fix (HasPreviousPackageInstalled)",
defaultValue: false,
restartRequired: true,
description: "Patch OnMainWindowLoaded to skip the HasPreviousPackageInstalled check that throws under Wine (fixes preferences not saving). On Affinity 3.2.x this exposes the first-run onboarding/home page which is hosted in an in-app WebView2 that Wine cannot render, causing a startup crash. Leave disabled unless you know your Affinity/Wine combination doesn't hit the WebView2 path.")
.AddSection("Crash Fixes")
.AddBool(SettingForceSyncFontEnum, "Force synchronous font enumeration",
defaultValue: true,
Expand Down Expand Up @@ -108,8 +113,15 @@ public override void OnPatch(Harmony harmony, IPluginContext context)
Patches.BezierSplitBudgetPatch.Apply();
}

context.Patch("MainWindowLoaded fix",
h => Patches.MainWindowLoadedPatch.ApplyPatches(h));
if (context.Settings.GetEffectiveValue<bool>(SettingMainWindowLoadedFix))
{
context.Patch("MainWindowLoaded fix",
h => Patches.MainWindowLoadedPatch.ApplyPatches(h));
}
else
{
Logger.Info("Skipping MainWindowLoaded fix (disabled to avoid WebView2 onboarding crash on Affinity 3.2.x)");
}

if (context.Settings.GetEffectiveValue<bool>(SettingForceSyncFontEnum))
{
Expand Down