From f6cd6d31ff26e6d7823f7e37bdde7a36eb4fb3dd Mon Sep 17 00:00:00 2001 From: goaaats Date: Tue, 11 Nov 2025 20:29:06 +0100 Subject: [PATCH] Adjust branch switcher to XL 7, pass beta kind and key as arguments --- .../Internal/Windows/BranchSwitcherWindow.cs | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs b/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs index 5caf8b5be..f7250e528 100644 --- a/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs +++ b/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs @@ -83,25 +83,12 @@ public class BranchSwitcherWindow : Window ImGuiHelpers.ScaledDummy(5); - void Pick() + if (ImGui.Button("Pick & Restart"u8)) { var config = Service.Get(); config.DalamudBetaKind = pickedBranch.Key; config.DalamudBetaKey = pickedBranch.Value.Key; config.QueueSave(); - } - - if (ImGui.Button("Pick"u8)) - { - Pick(); - this.IsOpen = false; - } - - ImGui.SameLine(); - - if (ImGui.Button("Pick & Restart"u8)) - { - Pick(); // If we exit immediately, we need to write out the new config now Service.Get().ForceSave(); @@ -111,7 +98,16 @@ public class BranchSwitcherWindow : Window if (File.Exists(xlPath)) { - Process.Start(xlPath); + var ps = new ProcessStartInfo + { + FileName = xlPath, + UseShellExecute = false, + }; + + ps.ArgumentList.Add($"--dalamud-beta-kind={config.DalamudBetaKind}"); + ps.ArgumentList.Add($"--dalamud-beta-key={config.DalamudBetaKey}"); + + Process.Start(ps); Environment.Exit(0); } }