From cf1514d6be6d0d9963984b595240d1dc1db07bc3 Mon Sep 17 00:00:00 2001 From: pizzaboxer Date: Sat, 27 May 2023 19:25:33 +0100 Subject: [PATCH] Use ToLowerInvariant() instead of ToLower() (#268) oops --- Bloxstrap/Bootstrapper.cs | 6 +++--- Bloxstrap/ProtocolHandler.cs | 2 +- Bloxstrap/RobloxDeployment.cs | 4 ++-- Bloxstrap/ViewModels/InstallationViewModel.cs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 9ecfb0d..6392216 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -219,7 +219,7 @@ namespace Bloxstrap ClientVersion clientVersion = await RobloxDeployment.GetInfo(App.Settings.Prop.Channel); // briefly check if current channel is suitable to use - if (App.Settings.Prop.Channel.ToLower() != RobloxDeployment.DefaultChannel.ToLower() && App.Settings.Prop.ChannelChangeMode != ChannelChangeMode.Ignore) + if (App.Settings.Prop.Channel.ToLowerInvariant() != RobloxDeployment.DefaultChannel.ToLowerInvariant() && App.Settings.Prop.ChannelChangeMode != ChannelChangeMode.Ignore) { string? switchDefaultPrompt = null; ClientVersion? defaultChannelInfo = null; @@ -272,8 +272,8 @@ namespace Bloxstrap _launchCommandLine = _launchCommandLine.Replace("LAUNCHTIMEPLACEHOLDER", DateTimeOffset.Now.ToUnixTimeMilliseconds().ToString()); - if (App.Settings.Prop.Channel.ToLower() != RobloxDeployment.DefaultChannel.ToLower()) - _launchCommandLine += " -channel " + App.Settings.Prop.Channel.ToLower(); + if (App.Settings.Prop.Channel.ToLowerInvariant() != RobloxDeployment.DefaultChannel.ToLowerInvariant()) + _launchCommandLine += " -channel " + App.Settings.Prop.Channel.ToLowerInvariant(); // whether we should wait for roblox to exit to handle stuff in the background or clean up after roblox closes bool shouldWait = false; diff --git a/Bloxstrap/ProtocolHandler.cs b/Bloxstrap/ProtocolHandler.cs index ffae5e5..a186c93 100644 --- a/Bloxstrap/ProtocolHandler.cs +++ b/Bloxstrap/ProtocolHandler.cs @@ -57,7 +57,7 @@ namespace Bloxstrap if (key == "channel") { - if (val.ToLower() != App.Settings.Prop.Channel.ToLower() && App.Settings.Prop.ChannelChangeMode != ChannelChangeMode.Ignore) + if (val.ToLowerInvariant() != App.Settings.Prop.Channel.ToLowerInvariant() && App.Settings.Prop.ChannelChangeMode != ChannelChangeMode.Ignore) { MessageBoxResult result = App.Settings.Prop.ChannelChangeMode == ChannelChangeMode.Automatic ? MessageBoxResult.Yes : App.ShowMessageBox( $"{App.ProjectName} was launched with the Roblox build channel set to {val}, however your current preferred channel is {App.Settings.Prop.Channel}.\n\n" + diff --git a/Bloxstrap/RobloxDeployment.cs b/Bloxstrap/RobloxDeployment.cs index ed865c8..69390cc 100644 --- a/Bloxstrap/RobloxDeployment.cs +++ b/Bloxstrap/RobloxDeployment.cs @@ -78,8 +78,8 @@ namespace Bloxstrap string location = BaseUrl; - if (channel.ToLower() != DefaultChannel.ToLower()) - location += $"/channel/{channel.ToLower()}"; + if (channel.ToLowerInvariant() != DefaultChannel.ToLowerInvariant()) + location += $"/channel/{channel.ToLowerInvariant()}"; location += resource; diff --git a/Bloxstrap/ViewModels/InstallationViewModel.cs b/Bloxstrap/ViewModels/InstallationViewModel.cs index 7eca88e..ded5f5b 100644 --- a/Bloxstrap/ViewModels/InstallationViewModel.cs +++ b/Bloxstrap/ViewModels/InstallationViewModel.cs @@ -104,7 +104,7 @@ namespace Bloxstrap.ViewModels if (!value) { // roblox typically sets channels in all lowercase, so here we find if a case insensitive match exists - string? matchingChannel = Channels.Where(x => x.ToLower() == Channel.ToLower()).FirstOrDefault(); + string? matchingChannel = Channels.Where(x => x.ToLowerInvariant() == Channel.ToLowerInvariant()).FirstOrDefault(); Channel = String.IsNullOrEmpty(matchingChannel) ? RobloxDeployment.DefaultChannel : matchingChannel; }