From a3798f4a546f1996e742c414f9fab5194de065d7 Mon Sep 17 00:00:00 2001 From: 1011025m <37438176+1011025m@users.noreply.github.com> Date: Sun, 29 Oct 2023 20:46:03 +0800 Subject: [PATCH] Respect user setting for changing release channels Added a few prompts --- Bloxstrap/Bootstrapper.cs | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index eafb5c7..bc8d4cf 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -237,9 +237,24 @@ namespace Bloxstrap // Janky fix for error 401 ~25/10/2023 if (ex.ResponseMessage.StatusCode == HttpStatusCode.Unauthorized) { - App.Logger.WriteLine(LOG_IDENT, $"Setting channel to {RobloxDeployment.DefaultChannel} because channel {App.Settings.Prop.Channel} is unavailable to the user."); - Controls.ShowMessageBox( - $"Release channel {App.Settings.Prop.Channel} is not available to you. It has been reset to {RobloxDeployment.DefaultChannel}.", MessageBoxImage.Information); + App.Logger.WriteLine(LOG_IDENT, $"Channel {App.Settings.Prop.Channel} is unavailable to the user."); + if (App.Settings.Prop.ChannelChangeMode == ChannelChangeMode.Automatic) + Controls.ShowMessageBox($"Release channel {App.Settings.Prop.Channel} is not available to you. It has been reset to {RobloxDeployment.DefaultChannel}.", MessageBoxImage.Information); + else + { + MessageBoxResult channelChangeResult = Controls.ShowMessageBox( + $"Release channel {App.Settings.Prop.Channel} is not available to you. Would you like to reset to {RobloxDeployment.DefaultChannel}?", + MessageBoxImage.Warning, + MessageBoxButton.YesNo); + + if (channelChangeResult != MessageBoxResult.Yes) + { + Controls.ShowMessageBox($"Client cannot be launched as you are enrolled into an unavailable release channel and refused to reset.", MessageBoxImage.Error); + App.Logger.WriteLine(LOG_IDENT, $"User refused to reset channel. Aborting."); + App.Terminate(ErrorCode.ERROR_CANCELLED); + } + } + App.Logger.WriteLine(LOG_IDENT, $"Resetting release channel to {RobloxDeployment.DefaultChannel} as {App.Settings.Prop.Channel} is unavailable to the user."); } App.Settings.Prop.Channel = RobloxDeployment.DefaultChannel;