Skip to content

Commit 4fbcce1

Browse files
authored
Merge pull request #204 from reiichi001/add_start_without_plugins
2 parents a39a6b5 + 043bc8f commit 4fbcce1

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/XIVLauncher.Core/Components/MainPage/LoginAction.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public enum LoginAction
44
{
55
Game,
66
GameNoDalamud,
7+
GameNoPlugins,
78
GameNoThirdparty,
89
GameNoLaunch,
910
Repair,

src/XIVLauncher.Core/Components/MainPage/LoginFrame.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,13 @@ public override void Draw()
119119

120120
ImGui.Separator();
121121

122+
if (ImGui.MenuItem("Launch without any plugins"))
123+
{
124+
this.OnLogin?.Invoke(LoginAction.GameNoPlugins);
125+
}
126+
127+
ImGui.Separator();
128+
122129
if (ImGui.MenuItem("Launch without custom repo plugins"))
123130
{
124131
this.OnLogin?.Invoke(LoginAction.GameNoThirdparty);

src/XIVLauncher.Core/Components/MainPage/MainPage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ private async Task<bool> TryProcessLoginResult(Launcher.LoginResult loginResult,
369369

370370
try
371371
{
372-
using var process = await StartGameAndAddon(loginResult, isSteam, action == LoginAction.GameNoDalamud, action == LoginAction.GameNoThirdparty).ConfigureAwait(false);
372+
using var process = await StartGameAndAddon(loginResult, isSteam, action == LoginAction.GameNoDalamud, action == LoginAction.GameNoPlugins, action == LoginAction.GameNoThirdparty).ConfigureAwait(false);
373373

374374
if (process is null)
375375
throw new InvalidOperationException("Could not obtain Process Handle");
@@ -592,7 +592,7 @@ private async Task<bool> TryProcessLoginResult(Launcher.LoginResult loginResult,
592592
}
593593
}
594594

595-
public async Task<Process> StartGameAndAddon(Launcher.LoginResult loginResult, bool isSteam, bool forceNoDalamud, bool noThird)
595+
public async Task<Process> StartGameAndAddon(Launcher.LoginResult loginResult, bool isSteam, bool forceNoDalamud, bool noPlugins , bool noThird)
596596
{
597597
var dalamudOk = false;
598598

@@ -620,7 +620,7 @@ public async Task<Process> StartGameAndAddon(Launcher.LoginResult loginResult, b
620620
var dalamudLauncher = new DalamudLauncher(dalamudRunner, Program.DalamudUpdater,
621621
App.Settings.DalamudLoadMethod.GetValueOrDefault(DalamudLoadMethod.DllInject), App.Settings.GamePath,
622622
App.Storage.Root, App.Storage.GetFolder("logs"), App.Settings.ClientLanguage ?? ClientLanguage.English,
623-
App.Settings.DalamudLoadDelay, false, false, noThird, Troubleshooting.GetTroubleshootingJson());
623+
App.Settings.DalamudLoadDelay, false, noPlugins, noThird, Troubleshooting.GetTroubleshootingJson());
624624

625625
try
626626
{

0 commit comments

Comments
 (0)