diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 10dbe28..44237db 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -280,8 +280,7 @@ namespace Bloxstrap Dialog.CloseDialog(); await gameClient.WaitForExitAsync(); - if (richPresence is not null) - richPresence.Dispose(); + richPresence?.Dispose(); if (App.Settings.RFUAutoclose && rbxFpsUnlocker is not null) rbxFpsUnlocker.Kill(); diff --git a/Bloxstrap/Dialogs/BootstrapperDialogForm.cs b/Bloxstrap/Dialogs/BootstrapperDialogForm.cs index 7874267..facbdba 100644 --- a/Bloxstrap/Dialogs/BootstrapperDialogForm.cs +++ b/Bloxstrap/Dialogs/BootstrapperDialogForm.cs @@ -12,6 +12,8 @@ namespace Bloxstrap.Dialogs { public Bootstrapper? Bootstrapper { get; set; } + protected override bool ShowWithoutActivation => App.IsQuiet; + protected virtual string _message { get; set; } = "Please wait..."; protected virtual ProgressBarStyle _progressStyle { get; set; } protected virtual int _progressValue { get; set; } diff --git a/Bloxstrap/Enums/BootstrapperStyle.cs b/Bloxstrap/Enums/BootstrapperStyle.cs index cd0d800..7fa546e 100644 --- a/Bloxstrap/Enums/BootstrapperStyle.cs +++ b/Bloxstrap/Enums/BootstrapperStyle.cs @@ -37,9 +37,21 @@ namespace Bloxstrap.Enums dialog = new ProgressDialog(bootstrapper); break; } - - if (!App.IsQuiet) + + if (bootstrapper is null) + { dialog.ShowDialog(); + } + else + { + if (App.IsQuiet) + { + dialog.Opacity = 0; + dialog.ShowInTaskbar = false; + } + + Application.Run(dialog); + } } } } diff --git a/Bloxstrap/Helpers/Integrations/ReShade.cs b/Bloxstrap/Helpers/Integrations/ReShade.cs index f513402..162a1e4 100644 --- a/Bloxstrap/Helpers/Integrations/ReShade.cs +++ b/Bloxstrap/Helpers/Integrations/ReShade.cs @@ -300,6 +300,9 @@ namespace Bloxstrap.Helpers.Integrations public static void UninstallExtraviPresets() { + if (!Directory.Exists(PresetsFolder)) + return; + Debug.WriteLine("[ReShade] Uninstalling Extravi's presets..."); FileInfo[] presets = new DirectoryInfo(PresetsFolder).GetFiles(); diff --git a/Bloxstrap/Properties/launchSettings.json b/Bloxstrap/Properties/launchSettings.json index baeb018..2e70619 100644 --- a/Bloxstrap/Properties/launchSettings.json +++ b/Bloxstrap/Properties/launchSettings.json @@ -1,8 +1,12 @@ { "profiles": { - "Bloxstrap": { + "Bloxstrap (Launch)": { "commandName": "Project" }, + "Bloxstrap (Quiet)": { + "commandName": "Project", + "commandLineArgs": "-quiet" + }, "Bloxstrap (Menu)": { "commandName": "Project", "commandLineArgs": "-preferences"