SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix-268' into version-2.4.0

Browse Source
This commit is contained in:
pizzaboxer 2023-05-27 19:27:42 +01:00
commit 7b950cba55
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Bloxstrap/Bootstrapper.cs
View File

@ -215,7 +215,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;
@ -268,8 +268,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;

2
Bloxstrap/ProtocolHandler.cs
View File

@ -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" +

4
Bloxstrap/RobloxDeployment.cs
View File

@ -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;

2
Bloxstrap/UI/Menu/ViewModels/InstallationViewModel.cs
View File

@ -105,7 +105,7 @@ namespace Bloxstrap.UI.Menu.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;
}