From 456c3e48adbff913e2555f1517e5f6b18e142b9d Mon Sep 17 00:00:00 2001 From: pizzaboxer Date: Fri, 3 Nov 2023 08:46:29 +0000 Subject: [PATCH] Change wording of warning, and remove choice --- Bloxstrap/Bootstrapper.cs | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 2fe3a0c..1699819 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -231,29 +231,27 @@ namespace Bloxstrap { // If channel does not exist if (ex.ResponseMessage.StatusCode == HttpStatusCode.NotFound) + { App.Logger.WriteLine(LOG_IDENT, $"Reverting enrolled channel to {RobloxDeployment.DefaultChannel} because a WindowsPlayer build does not exist for {App.Settings.Prop.Channel}"); + } // If channel is not available to the user (private/internal release channel) else if (ex.ResponseMessage.StatusCode == HttpStatusCode.Unauthorized) { - App.Logger.WriteLine(LOG_IDENT, $"Channel {App.Settings.Prop.Channel} is unavailable to the user."); + App.Logger.WriteLine(LOG_IDENT, $"Reverting enrolled channel to {RobloxDeployment.DefaultChannel} because {App.Settings.Prop.Channel} is restricted for public use."); + // Only prompt if user has channel switching mode set to something other than Automatic. if (App.Settings.Prop.ChannelChangeMode != ChannelChangeMode.Automatic) { - 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); - } + Controls.ShowMessageBox( + $"The channel you're currently on ({App.Settings.Prop.Channel}) has now been restricted from public use. You will now be on the default channel ({RobloxDeployment.DefaultChannel}).", + MessageBoxImage.Information + ); } - App.Logger.WriteLine(LOG_IDENT, $"Resetting release channel to {RobloxDeployment.DefaultChannel} as {App.Settings.Prop.Channel} is unavailable to the user."); } - else throw; + else + { + throw; + } App.Settings.Prop.Channel = RobloxDeployment.DefaultChannel; clientVersion = await RobloxDeployment.GetInfo(App.Settings.Prop.Channel);