Merge pull request #28 from Blooym/launch-without-3pp

Launch without 3rd-party plugins option
goatcorp · Jun 16, 2023 · 1ee7ad7 · 1ee7ad7
2 parents 35df567 + ba63017
commit 1ee7ad7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/XIVLauncher.Core/Components/MainPage/LoginAction.cs b/src/XIVLauncher.Core/Components/MainPage/LoginAction.cs
@@ -4,6 +4,7 @@ public enum LoginAction
 {
     Game,
     GameNoDalamud,
+    GameNoThirdparty,
     GameNoLaunch,
     Repair,
     Fake,

diff --git a/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs b/src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs
@@ -117,6 +117,13 @@ public override void Draw()
 
                 ImGui.Separator();
 
+                if (ImGui.MenuItem("Launch without 3rd-party plugins"))
+                {
+                    this.OnLogin?.Invoke(LoginAction.GameNoThirdparty);
+                }
+
+                ImGui.Separator();
+
                 if (ImGui.MenuItem("Patch without launching"))
                 {
                     this.OnLogin?.Invoke(LoginAction.GameNoLaunch);

diff --git a/src/XIVLauncher.Core/Components/MainPage/MainPage.cs b/src/XIVLauncher.Core/Components/MainPage/MainPage.cs
@@ -374,7 +374,7 @@ private async Task<bool> TryProcessLoginResult(Launcher.LoginResult loginResult,
 
             try
             {
-                using var process = await StartGameAndAddon(loginResult, isSteam, action == LoginAction.GameNoDalamud, false).ConfigureAwait(false);
+                using var process = await StartGameAndAddon(loginResult, isSteam, action == LoginAction.GameNoDalamud, action == LoginAction.GameNoThirdparty).ConfigureAwait(false);
 
                 if (process is null)
                     throw new Exception("Could not obtain Process Handle");