Fixed channel manager not working

Author: Meddsam

Bloxstrap/RobloxInterfaces/Deployment.cs

@@ -16,8 +16,8 @@ public static class Deployment
 
         public static string BinaryType = "WindowsPlayer";
 
-        public static bool IsDefaultChannel => Channel.Equals(DefaultChannel, StringComparison.OrdinalIgnoreCase);
-        
+        public static bool IsDefaultChannel => Channel.Equals(DefaultChannel, StringComparison.OrdinalIgnoreCase) || Channel.Equals("live", StringComparison.OrdinalIgnoreCase);
+
         public static string BaseUrl { get; private set; } = null!;
 
         public static readonly List<HttpStatusCode?> BadChannelCodes = new()
@@ -200,7 +200,7 @@ public static async Task<ClientVersion> GetInfo(string ? channel = null)
                 {
                     var defaultClientVersion = await GetInfo(DefaultChannel);
 
-                    if (Utilities.CompareVersions(clientVersion.Version, defaultClientVersion.Version) == VersionComparison.LessThan)
+                    if ((Utilities.CompareVersions(clientVersion.Version, defaultClientVersion.Version) == VersionComparison.LessThan))
                         clientVersion.IsBehindDefaultChannel = true;
                 }
 

Bloxstrap/UI/Elements/Settings/MainWindow.xaml

@@ -21,16 +21,6 @@
              Closing="WpfUiWindow_Closing"
              Closed="WpfUiWindow_Closed">
 
-    <Window.Resources>
-        <Storyboard x:Key="SpinStoryboard" RepeatBehavior="Forever">
-            <DoubleAnimation
-            Storyboard.TargetName="SpinnerRotateTransform"
-            Storyboard.TargetProperty="Angle"
-            From="0" To="360"
-            Duration="0:0:1" />
-        </Storyboard>
-    </Window.Resources>
-
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />

Bloxstrap/UI/ViewModels/Settings/ChannelViewModel.cs

@@ -1,10 +1,8 @@
-using System.ComponentModel;
-using System.Windows;
+using Bloxstrap.AppData;
 using Bloxstrap.RobloxInterfaces;
 
 namespace Bloxstrap.UI.ViewModels.Settings
 {
-
     public class ChannelViewModel : NotifyPropertyChangedViewModel
     {
         private string _oldPlayerVersionGuid = "";
@@ -13,51 +11,13 @@ public class ChannelViewModel : NotifyPropertyChangedViewModel
         public ChannelViewModel()
         {
             Task.Run(() => LoadChannelDeployInfo(App.Settings.Prop.Channel));
-
-            // Initialize SelectedPriority from settings
-            _selectedPriority = App.Settings.Prop.SelectedProcessPriority;
         }
 
-        public new event PropertyChangedEventHandler? PropertyChanged;
-        private new void OnPropertyChanged(string propertyName) =>
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-
         public bool UpdateCheckingEnabled
         {
             get => App.Settings.Prop.CheckForUpdates;
             set => App.Settings.Prop.CheckForUpdates = value;
         }
-        public bool DisableAnimations
-        {
-            get => App.Settings.Prop.DisableAnimations;
-            set => App.Settings.Prop.DisableAnimations = value;
-        }
-
-        public bool HardwareAcceleration
-        {
-            get => App.Settings.Prop.WPFSoftwareRender;
-            set => App.Settings.Prop.WPFSoftwareRender = value;
-        }
-
-
-        private ProcessPriorityOption _selectedPriority;
-
-        public IReadOnlyList<ProcessPriorityOption> ProcessPriorityOptions { get; } =
-            Enum.GetValues(typeof(ProcessPriorityOption)).Cast<ProcessPriorityOption>().ToList();
-
-        public ProcessPriorityOption SelectedPriority
-        {
-            get => _selectedPriority;
-            set
-            {
-                if (_selectedPriority != value)
-                {
-                    _selectedPriority = value;
-                    App.Settings.Prop.SelectedProcessPriority = value;
-                    OnPropertyChanged(nameof(SelectedPriority));
-                }
-            }
-        }
 
         private async Task LoadChannelDeployInfo(string channel)
         {
@@ -101,9 +61,6 @@ private async Task LoadChannelDeployInfo(string channel)
             }
         }
 
-        public bool IsRobloxInstallationMissing => string.IsNullOrEmpty(App.State.Prop.Player.VersionGuid) &&
-                                                    string.IsNullOrEmpty(App.State.Prop.Studio.VersionGuid);
-
         public bool ShowLoadingError { get; set; } = false;
         public bool ShowChannelWarning { get; set; } = false;
 
@@ -118,7 +75,14 @@ public string ViewChannel
                 value = value.Trim();
                 Task.Run(() => LoadChannelDeployInfo(value));
 
-                App.Settings.Prop.Channel = value;
+                if (value.ToLower() == "live" || value.ToLower() == "zlive")
+                {
+                    App.Settings.Prop.Channel = Deployment.DefaultChannel;
+                }
+                else
+                {
+                    App.Settings.Prop.Channel = value;
+                }
             }
         }
 
@@ -129,7 +93,7 @@ public string ChannelHash
             {
                 const string VersionHashFormat = "version-(.*)";
                 Match match = Regex.Match(value, VersionHashFormat);
-                if (match.Success || string.IsNullOrEmpty(value))
+                if (match.Success || String.IsNullOrEmpty(value))
                 {
                     App.Settings.Prop.ChannelHash = value;
                 }
@@ -176,5 +140,37 @@ public bool ForceRobloxReinstallation
                 }
             }
         }
+
+        public bool DisableAnimations
+        {
+            get => App.Settings.Prop.DisableAnimations;
+            set => App.Settings.Prop.DisableAnimations = value;
+        }
+
+        public bool HardwareAcceleration
+        {
+            get => App.Settings.Prop.WPFSoftwareRender;
+            set => App.Settings.Prop.WPFSoftwareRender = value;
+        }
+
+
+        private ProcessPriorityOption _selectedPriority;
+
+        public IReadOnlyList<ProcessPriorityOption> ProcessPriorityOptions { get; } =
+            Enum.GetValues(typeof(ProcessPriorityOption)).Cast<ProcessPriorityOption>().ToList();
+
+        public ProcessPriorityOption SelectedPriority
+        {
+            get => _selectedPriority;
+            set
+            {
+                if (_selectedPriority != value)
+                {
+                    _selectedPriority = value;
+                    App.Settings.Prop.SelectedProcessPriority = value;
+                    OnPropertyChanged(nameof(SelectedPriority));
+                }
+            }
+        }
     }
 }