Merge branch 'pizzaboxer:version-2.5.1' into version-2.5.1

Bloxstrap/Bootstrapper.cs

@@ -60,6 +60,7 @@ namespace Bloxstrap
 
         private string _latestVersionGuid = null!;
         private PackageManifest _versionPackageManifest = null!;
+        private FileManifest _versionFileManifest = null!;
         private string _versionFolder = null!;
 
         private bool _isInstalling = false;
@@ -118,10 +119,11 @@ namespace Bloxstrap
 
             App.Logger.WriteLine(LOG_IDENT, "Performing connectivity check...");
 
+            SetStatus("Connecting to Roblox...");
+
             try
             {
                 await RobloxDeployment.GetInfo(RobloxDeployment.DefaultChannel);
-                App.Logger.WriteLine(LOG_IDENT, "Connectivity check finished");
             }
             catch (Exception ex)
             {
@@ -132,14 +134,19 @@ namespace Bloxstrap
 
                 if (ex.GetType() == typeof(HttpResponseException))
                     message = "Roblox may be down right now. See status.roblox.com for more information. Please try again later.";
-
+                else if (ex.GetType() == typeof(TaskCanceledException))
-                if (ex.GetType() == typeof(AggregateException))
+                    message = "Bloxstrap timed out when trying to connect to three different Roblox deployment mirrors, indicating a poor internet connection. Please try again later.";
+                else if (ex.GetType() == typeof(AggregateException))
                     ex = ex.InnerException!;
 
                 Controls.ShowConnectivityDialog("Roblox", message, ex);
 
                 App.Terminate(ErrorCode.ERROR_CANCELLED);
             }
+            finally
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Connectivity check finished");
+            }
 
 #if !DEBUG
             if (!App.IsFirstRun && App.Settings.Prop.CheckForUpdates)
@@ -153,8 +160,9 @@ namespace Bloxstrap
 
             try
             {
-                Mutex.OpenExisting("Bloxstrap_BootstrapperMutex").Close();
+                Mutex.OpenExisting("Bloxstrap_SingletonMutex").Close();
-                App.Logger.WriteLine(LOG_IDENT, "Bloxstrap_BootstrapperMutex mutex exists, waiting...");
+                App.Logger.WriteLine(LOG_IDENT, "Bloxstrap_SingletonMutex mutex exists, waiting...");
+                SetStatus("Waiting for other instances...");
                 mutexExists = true;
             }
             catch (Exception)
@@ -163,7 +171,7 @@ namespace Bloxstrap
             }
 
             // wait for mutex to be released if it's not yet
-            await using AsyncMutex mutex = new("Bloxstrap_BootstrapperMutex");
+            await using var mutex = new AsyncMutex(true, "Bloxstrap_SingletonMutex");
             await mutex.AcquireAsync(_cancelTokenSource.Token);
 
             // reload our configs since they've likely changed by now
@@ -175,8 +183,6 @@ namespace Bloxstrap
 
             await CheckLatestVersion();
 
-            CheckInstallMigration();
-
             // install/update roblox if we're running for the first time, needs updating, or the player location doesn't exist
             if (App.IsFirstRun || _latestVersionGuid != App.State.Prop.VersionGuid || !File.Exists(_playerLocation))
                 await InstallLatestVersion();
@@ -214,9 +220,23 @@ namespace Bloxstrap
 
         private async Task CheckLatestVersion()
         {
-            SetStatus("Connecting to Roblox...");
+            const string LOG_IDENT = "Bootstrapper::CheckLatestVersion";
-            
+
-            var clientVersion = await RobloxDeployment.GetInfo(App.Settings.Prop.Channel);
+            ClientVersion clientVersion;
+
+            try
+            {
+                clientVersion = await RobloxDeployment.GetInfo(App.Settings.Prop.Channel);
+            }
+            catch (HttpResponseException ex)
+            {
+                if (ex.ResponseMessage.StatusCode != HttpStatusCode.NotFound)
+                    throw;
+
+                App.Logger.WriteLine(LOG_IDENT, $"Reverting enrolled channel to {RobloxDeployment.DefaultChannel} because a WindowsPlayer build does not exist for {App.Settings.Prop.Channel}");
+                App.Settings.Prop.Channel = RobloxDeployment.DefaultChannel;
+                clientVersion = await RobloxDeployment.GetInfo(App.Settings.Prop.Channel);
+            }
 
             if (clientVersion.IsBehindDefaultChannel)
             {
@@ -245,6 +265,7 @@ namespace Bloxstrap
             _latestVersionGuid = clientVersion.VersionGuid;
             _versionFolder = Path.Combine(Paths.Versions, _latestVersionGuid);
             _versionPackageManifest = await PackageManifest.Get(_latestVersionGuid);
+            _versionFileManifest = await FileManifest.Get(_latestVersionGuid);
         }
 
         private async Task StartRoblox()
@@ -405,6 +426,8 @@ namespace Bloxstrap
                 App.Logger.WriteException(LOG_IDENT, ex);
             }
 
+            Dialog?.CloseBootstrapper();
+
             App.Terminate(ErrorCode.ERROR_CANCELLED);
         }
         #endregion
@@ -458,71 +481,6 @@ namespace Bloxstrap
             App.Logger.WriteLine(LOG_IDENT, $"Registered as {totalSize} KB");
         }
 
-        private void CheckInstallMigration()
-        {
-            const string LOG_IDENT = "Bootstrapper::CheckInstallMigration";
-            
-            // check if we've changed our install location since the last time we started
-            // in which case, we'll have to copy over all our folders so we don't lose any mods and stuff
-
-            using RegistryKey? applicationKey = Registry.CurrentUser.OpenSubKey($@"Software\{App.ProjectName}", true);
-
-            string? oldInstallLocation = (string?)applicationKey?.GetValue("OldInstallLocation");
-
-            if (applicationKey is null || oldInstallLocation is null || oldInstallLocation == Paths.Base)
-                return;
-
-            SetStatus("Migrating install location...");
-
-            if (Directory.Exists(oldInstallLocation))
-            {
-                App.Logger.WriteLine(LOG_IDENT, $"Moving all files in {oldInstallLocation} to {Paths.Base}...");
-
-                foreach (string oldFileLocation in Directory.GetFiles(oldInstallLocation, "*.*", SearchOption.AllDirectories))
-                {
-                    string relativeFile = oldFileLocation.Substring(oldInstallLocation.Length + 1);
-                    string newFileLocation = Path.Combine(Paths.Base, relativeFile);
-                    string? newDirectory = Path.GetDirectoryName(newFileLocation);
-
-                    try
-                    {
-                        if (!String.IsNullOrEmpty(newDirectory))
-                            Directory.CreateDirectory(newDirectory);
-
-                        File.Move(oldFileLocation, newFileLocation, true);
-                    }
-                    catch (Exception ex)
-                    {
-                        App.Logger.WriteLine(LOG_IDENT, $"Failed to move {oldFileLocation} to {newFileLocation}! {ex}");
-                    }
-                }
-
-                try
-                {
-                    Directory.Delete(oldInstallLocation, true);
-                    App.Logger.WriteLine(LOG_IDENT, "Deleted old install location");
-                }
-                catch (Exception ex)
-                {
-                    App.Logger.WriteLine(LOG_IDENT, $"Failed to delete old install location! {ex}");
-                }
-            }
-
-            applicationKey.DeleteValue("OldInstallLocation");
-
-            // allow shortcuts to be re-registered
-            if (Directory.Exists(Paths.StartMenu))
-                Directory.Delete(Paths.StartMenu, true);
-
-            if (File.Exists(DesktopShortcutLocation))
-            {
-                File.Delete(DesktopShortcutLocation);
-                App.Settings.Prop.CreateDesktopIcon = true;
-            }
-
-            App.Logger.WriteLine(LOG_IDENT, "Finished migrating install location!");
-        }
-
         public static void CheckInstall()
         {
             const string LOG_IDENT = "Bootstrapper::CheckInstall";
@@ -727,7 +685,7 @@ namespace Bloxstrap
             // if the folder we're installed to does not end with "Bloxstrap", we're installed to a user-selected folder
             // in which case, chances are they chose to install to somewhere they didn't really mean to (prior to the added warning in 2.4.0)
             // if so, we're walking on eggshells and have to ensure we only clean up what we need to clean up
-            bool cautiousUninstall = !Paths.Base.EndsWith(App.ProjectName);
+            bool cautiousUninstall = !Paths.Base.ToLower().EndsWith(App.ProjectName.ToLower());
 
             var cleanupSequence = new List<Action>
             {
@@ -1022,6 +980,12 @@ namespace Bloxstrap
         {
             const string LOG_IDENT = "Bootstrapper::ApplyModifications";
             
+            if (Process.GetProcessesByName("RobloxPlayerBeta").Where(x => x.MainModule!.FileName == _playerLocation).Any())
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Roblox is running, aborting mod check");
+                return;
+            }
+
             SetStatus("Applying Roblox modifications...");
 
             // set executable flags for fullscreen optimizations
@@ -1355,6 +1319,9 @@ namespace Bloxstrap
 
             for (int i = 1; i <= maxTries; i++)
             {
+                if (_cancelFired)
+                    return;
+
                 int totalBytesRead = 0;
 
                 try
@@ -1393,7 +1360,8 @@ namespace Bloxstrap
                     App.Logger.WriteLine(LOG_IDENT, $"An exception occurred after downloading {totalBytesRead} bytes. ({i}/{maxTries})");
                     App.Logger.WriteException(LOG_IDENT, ex);
 
-                    File.Delete(packageLocation);
+                    if (File.Exists(packageLocation))
+                        File.Delete(packageLocation);
 
                     if (i >= maxTries)
                         throw;
@@ -1438,6 +1406,16 @@ namespace Bloxstrap
                 if (directory is not null)
                     Directory.CreateDirectory(directory);
 
+                if (File.Exists(extractPath))
+                {
+                    var fileManifest = _versionFileManifest.FirstOrDefault(x => x.Name == Path.Combine(PackageDirectories[package.Name], entry.FullName));
+
+                    if (fileManifest is not null && MD5Hash.FromFile(extractPath) == fileManifest.Signature)
+                        continue;
+
+                    File.Delete(extractPath);
+                }
+
                 entry.ExtractToFile(extractPath, true);
             }
 

Bloxstrap/FastFlagManager.cs

@@ -45,7 +45,12 @@ namespace Bloxstrap
             { "UI.Menu.GraphicsSlider", "FFlagFixGraphicsQuality" },
             
             { "UI.Menu.Style.DisableV2", "FFlagDisableNewIGMinDUA" },
-            { "UI.Menu.Style.EnableV4", "FFlagEnableInGameMenuControls" }
+            { "UI.Menu.Style.EnableV4", "FFlagEnableInGameMenuControls" },
+
+            { "UI.Menu.Style.ABTest.1", "FFlagEnableMenuControlsABTest" },
+            { "UI.Menu.Style.ABTest.2", "FFlagEnableMenuModernizationABTest" },
+            { "UI.Menu.Style.ABTest.3", "FFlagEnableMenuModernizationABTest2" },
+            { "UI.Menu.Style.ABTest.4", "FFlagEnableV3MenuABTest3" }
         };
 
         // only one missing here is Metal because lol
@@ -91,7 +96,8 @@ namespace Bloxstrap
                 new Dictionary<string, string?>
                 {
                     { "DisableV2", null },
-                    { "EnableV4", null }
+                    { "EnableV4", null },
+                    { "ABTest", null }
                 }
             },
 
@@ -100,7 +106,8 @@ namespace Bloxstrap
                 new Dictionary<string, string?>
                 {
                     { "DisableV2", "True" },
-                    { "EnableV4", "False" }
+                    { "EnableV4", "False" },
+                    { "ABTest", "False" }
                 }
             },
 
@@ -109,7 +116,8 @@ namespace Bloxstrap
                 new Dictionary<string, string?>
                 {
                     { "DisableV2", "False" },
-                    { "EnableV4", "False" }
+                    { "EnableV4", "False" },
+                    { "ABTest", "False" }
                 }
             },
 
@@ -118,7 +126,8 @@ namespace Bloxstrap
                 new Dictionary<string, string?>
                 {
                     { "DisableV2", "True" },
-                    { "EnableV4", "True" }
+                    { "EnableV4", "True" },
+                    { "ABTest", "False" }
                 }
             }
         };

Bloxstrap/GlobalUsings.cs

@@ -18,8 +18,9 @@ global using Bloxstrap.Enums;
 global using Bloxstrap.Exceptions;
 global using Bloxstrap.Extensions;
 global using Bloxstrap.Models;
-global using Bloxstrap.Models.BloxstrapRPC;
 global using Bloxstrap.Models.Attributes;
+global using Bloxstrap.Models.BloxstrapRPC;
 global using Bloxstrap.Models.RobloxApi;
+global using Bloxstrap.Models.Manifest;
 global using Bloxstrap.UI;
 global using Bloxstrap.Utility;

Bloxstrap/InstallChecker.cs

@@ -223,6 +223,10 @@ namespace Bloxstrap
                 else if (existingVersionInfo.ProductVersion == "2.5.0")
                 {
                     App.FastFlags.SetValue("FIntDebugForceMSAASamples", null);
+
+                    if (App.FastFlags.GetPreset("UI.Menu.Style.DisableV2") is not null)
+                        App.FastFlags.SetPreset("UI.Menu.Style.ABTest", false);
+
                     App.FastFlags.Save();
                 }
             }

Bloxstrap/Integrations/DiscordRichPresence.cs

@@ -261,6 +261,9 @@ namespace Bloxstrap.Integrations
                 _ => $"by {universeDetails.Creator.Name}" + (universeDetails.Creator.HasVerifiedBadge ? " ☑️" : ""),
             };
 
+            if (universeDetails.Name.Length < 2)
+                universeDetails.Name = $"{universeDetails.Name}\x2800\x2800\x2800";
+
             _currentPresence = new DiscordRPC.RichPresence
             {
                 Details = $"Playing {universeDetails.Name}",

Bloxstrap/Models/Manifest/FileManifest.cs

@@ -0,0 +1,33 @@
+namespace Bloxstrap.Models.Manifest
+{
+    public class FileManifest : List<ManifestFile>
+    {
+        private FileManifest(string data)
+        {
+            using StringReader reader = new StringReader(data);
+
+            while (true)
+            {
+                string? fileName = reader.ReadLine();
+                string? signature = reader.ReadLine();
+
+                if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(signature))
+                    break;
+
+                Add(new ManifestFile
+                {
+                    Name = fileName,
+                    Signature = signature
+                });
+            }
+        }
+
+        public static async Task<FileManifest> Get(string versionGuid)
+        {
+            string pkgManifestUrl = RobloxDeployment.GetLocation($"/{versionGuid}-rbxManifest.txt");
+            var pkgManifestData = await App.HttpClient.GetStringAsync(pkgManifestUrl);
+
+            return new FileManifest(pkgManifestData);
+        }
+    }
+}

Bloxstrap/Models/Manifest/ManifestFile.cs

@@ -0,0 +1,13 @@
+namespace Bloxstrap.Models.Manifest
+{
+    public class ManifestFile
+    {
+        public string Name { get; set; } = "";
+        public string Signature { get; set; } = "";
+
+        public override string ToString()
+        {
+            return $"[{Signature}] {Name}";
+        }
+    }
+}

Bloxstrap/Models/Manifest/Package.cs

@@ -4,7 +4,7 @@
  * Copyright (c) 2015-present MaximumADHD
 */
 
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.Manifest
 {
     public class Package
     {

Bloxstrap/Models/Manifest/PackageManifest.cs

@@ -4,7 +4,7 @@
  * Copyright (c) 2015-present MaximumADHD
 */
 
-namespace Bloxstrap.Models
+namespace Bloxstrap.Models.Manifest
 {
     public class PackageManifest : List<Package>
     {

Bloxstrap/RobloxDeployment.cs

@@ -52,18 +52,6 @@
                 return _baseUrl;
             }
         }
-
-        // most commonly used/interesting channels
-        public static readonly List<string> SelectableChannels = new()
-        {
-            "LIVE",
-            "ZFlag",
-            "ZNext",
-            "ZCanary",
-            "ZIntegration",
-            "ZAvatarTeam",
-            "ZSocialTeam"
-        };
         #endregion
 
         public static string GetLocation(string resource, string? channel = null)

Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs

@@ -96,7 +96,7 @@ namespace Bloxstrap.UI.Elements.ContextMenu
 
         private void RichPresenceMenuItem_Click(object sender, RoutedEventArgs e) => _richPresenceHandler?.SetVisibility(((MenuItem)sender).IsChecked);
 
-        private void InviteDeeplinkMenuItem_Click(object sender, RoutedEventArgs e) => Clipboard.SetText($"roblox://experiences/start?placeId={_activityWatcher?.ActivityPlaceId}&gameInstanceId={_activityWatcher?.ActivityJobId}");
+        private void InviteDeeplinkMenuItem_Click(object sender, RoutedEventArgs e) => Clipboard.SetDataObject($"roblox://experiences/start?placeId={_activityWatcher?.ActivityPlaceId}&gameInstanceId={_activityWatcher?.ActivityJobId}");
 
         private void ServerDetailsMenuItem_Click(object sender, RoutedEventArgs e) => ShowServerInformationWindow();
 

Bloxstrap/UI/Elements/Dialogs/AddFastFlagDialog.xaml

@@ -33,10 +33,10 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" MinWidth="100" Text="Flag name" Margin="0,0,0,12" />
+            <TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" MinWidth="100" Text="Name" Margin="0,0,0,12" />
             <TextBox Grid.Row="0" Grid.Column="1" Name="FlagNameTextBox" Margin="0,0,0,12" />
 
-            <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" MinWidth="100" Text="Flag value" />
+            <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" MinWidth="100" Text="Value" />
             <TextBox Grid.Row="1" Grid.Column="1" Name="FlagValueTextBox" />
         </Grid>
 

Bloxstrap/UI/Elements/Dialogs/BulkAddFastFlagDialog.xaml

@@ -0,0 +1,60 @@
+<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.BulkAddFastFlagDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+        xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
+        mc:Ignorable="d"
+        Title="Import JSON" 
+        MinHeight="0"
+        Width="480"
+        SizeToContent="Height"
+        ResizeMode="NoResize"
+        Background="{ui:ThemeResource ApplicationBackgroundBrush}"
+        ExtendsContentIntoTitleBar="True"
+        WindowStartupLocation="CenterScreen">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <ui:TitleBar Grid.Row="0" Grid.ColumnSpan="2" Padding="8" Title="Import JSON" ShowMinimize="False" ShowMaximize="False" CanMaximize="False" KeyboardNavigation.TabNavigation="None" />
+
+        <Grid Grid.Row="1" Margin="8,4,8,4">
+            <TextBox x:Name="JsonTextBox" Margin="5" AcceptsTab="True" AcceptsReturn="True" MinHeight="80" MaxHeight="480" />
+            <TextBlock IsHitTestVisible="False" Margin="18,14,0,0" Foreground="DarkGray">
+                <TextBlock.Style>
+                    <Style TargetType="{x:Type TextBlock}">
+                        <Setter Property="Visibility" Value="Collapsed"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding Text, ElementName=JsonTextBox}" Value="">
+                                <Setter Property="Visibility" Value="Visible"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+                 Paste in your JSON here...
+            </TextBlock>
+        </Grid>
+
+        <Border Grid.Row="3" Margin="0,10,0,0" Padding="15" Background="{ui:ThemeResource SolidBackgroundFillColorSecondaryBrush}">
+            <StackPanel Orientation="Horizontal" FlowDirection="LeftToRight" HorizontalAlignment="Right">
+                <Button MinWidth="100" Content="OK" Click="OKButton_Click">
+                    <Button.Style>
+                        <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding ElementName=JsonTextBox, Path=Text.Length}" Value="0">
+                                    <Setter Property="IsEnabled" Value="False" />
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                </Button>
+                <Button MinWidth="100" Margin="12,0,0,0" Content="Cancel" IsCancel="True" />
+            </StackPanel>
+        </Border>
+    </Grid>
+</ui:UiWindow>

Bloxstrap/UI/Elements/Dialogs/BulkAddFastFlagDialog.xaml.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace Bloxstrap.UI.Elements.Dialogs
+{
+    /// <summary>
+    /// Interaction logic for BulkAddFastFlagDialog.xaml
+    /// </summary>
+    public partial class BulkAddFastFlagDialog
+    {
+        public MessageBoxResult Result = MessageBoxResult.Cancel;
+
+        public BulkAddFastFlagDialog()
+        {
+            InitializeComponent();
+        }
+
+        private void OKButton_Click(object sender, RoutedEventArgs e)
+        {
+            Result = MessageBoxResult.OK;
+            Close();
+        }
+    }
+}

Bloxstrap/UI/Elements/Dialogs/ExceptionDialog.xaml.cs

@@ -33,7 +33,7 @@ namespace Bloxstrap.UI.Elements.Dialogs
                 if (App.Logger.Initialized)
                     Process.Start("explorer.exe", $"/select,\"{App.Logger.FileLocation}\"");
                 else
-                    Clipboard.SetText(String.Join("\r\n", App.Logger.Backlog));
+                    Clipboard.SetDataObject(String.Join("\r\n", App.Logger.Backlog));
             };
 
             ReportOptions.DropDownClosed += (sender, e) =>

Bloxstrap/UI/Elements/Menu/MainWindow.xaml

@@ -59,26 +59,24 @@
       </Grid>
     </Grid>
 
-    <StatusBar x:Name="RootStatusBar" Grid.Row="2" Padding="14,10" Background="{ui:ThemeResource ApplicationBackgroundBrush}" BorderThickness="0,1,0,0">
+        <StatusBar x:Name="RootStatusBar" Grid.Row="2" Padding="14,10" Background="{ui:ThemeResource ApplicationBackgroundBrush}" BorderThickness="0,1,0,0">
-      <StatusBar.ItemsPanel>
+            <StatusBar.ItemsPanel>
-        <ItemsPanelTemplate>
+                <ItemsPanelTemplate>
-          <Grid>
+                    <Grid>
-            <Grid.ColumnDefinitions>
+                        <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
-              <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
+                        </Grid.ColumnDefinitions>
-          </Grid>
+                    </Grid>
-        </ItemsPanelTemplate>
+                </ItemsPanelTemplate>
-      </StatusBar.ItemsPanel>
+            </StatusBar.ItemsPanel>
-      <StatusBarItem Grid.Column="1" Padding="0,0,4,0">
+            <StatusBarItem Grid.Column="1" Padding="0,0,4,0">
-        <ui:Button Content="{Binding ConfirmButtonText, Mode=OneTime}" Appearance="Primary" Command="{Binding ConfirmSettingsCommand, Mode=OneWay}" IsEnabled="{Binding ConfirmButtonEnabled, Mode=OneWay}" />
+                <ui:Button Content="{Binding ConfirmButtonText, Mode=OneTime}" Appearance="Primary" Command="{Binding ConfirmSettingsCommand, Mode=OneWay}" IsEnabled="{Binding ConfirmButtonEnabled, Mode=OneWay}" />
-      </StatusBarItem>
+            </StatusBarItem>
-      <StatusBarItem Grid.Column="2" Padding="4,0,0,0">
+            <StatusBarItem Grid.Column="2" Padding="4,0,0,0">
-        <ui:Button Content="Cancel" Command="{Binding CloseWindowCommand, Mode=OneWay}" />
+                <ui:Button Content="Cancel" Command="{Binding CloseWindowCommand, Mode=OneWay}" />
-      </StatusBarItem>
+            </StatusBarItem>
-    </StatusBar>
+        </StatusBar>
-
+    </Grid>
-    <ui:Dialog x:Name="RootDialog" Title="WPF UI" Grid.Row="1" Grid.RowSpan="2" ButtonLeftVisibility="Collapsed" ButtonRightName="Continue" DialogHeight="225" DialogWidth="430" />
-  </Grid>
 </ui:UiWindow>

Bloxstrap/UI/Elements/Menu/MainWindow.xaml.cs

@@ -15,16 +15,14 @@ namespace Bloxstrap.UI.Elements.Menu
     public partial class MainWindow : INavigationWindow
     {
         private readonly IThemeService _themeService = new ThemeService();
-        private readonly IDialogService _dialogService = new DialogService();
 
         public MainWindow()
         {
             App.Logger.WriteLine("MainWindow::MainWindow", "Initializing menu");
 
-            DataContext = new MainWindowViewModel(this, _dialogService);
+            DataContext = new MainWindowViewModel(this);
             SetTheme();
             InitializeComponent();
-            _dialogService.SetDialogControl(RootDialog);
         }
 
         public void SetTheme()

Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml

@@ -46,7 +46,7 @@
                         <TextBlock FontSize="14" Text="Channel" />
                         <TextBlock Margin="0,2,0,0" FontSize="12" Text="Choose which deployment channel Roblox should be downloaded from." Foreground="{DynamicResource TextFillColorTertiaryBrush}"  />
                     </StackPanel>
-                    <ComboBox Grid.Column="1" Margin="8,0,8,0" Padding="10,5,10,5" Width="200" IsEditable="True" ItemsSource="{Binding Channels, Mode=OneWay}" Text="{Binding SelectedChannel, Mode=TwoWay, Delay=250}" />
+                    <ui:TextBox Grid.Column="1" Margin="8,0,8,0" Padding="10,5,10,5" Width="200" Text="{Binding SelectedChannel, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Delay=250}" />
                 </Grid>
             </ui:CardExpander.Header>
             

Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml.cs

@@ -1,5 +1,4 @@
-using Bloxstrap.UI.ViewModels.Menu;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -14,6 +13,8 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
+using Bloxstrap.UI.ViewModels.Menu;
+
 namespace Bloxstrap.UI.Elements.Menu.Pages
 {
     /// <summary>

Bloxstrap/UI/Elements/Menu/Pages/FastFlagEditorPage.xaml.cs

@@ -215,58 +215,65 @@ namespace Bloxstrap.UI.Elements.Menu.Pages
 
         private void ImportJSONButton_Click(object sender, RoutedEventArgs e)
         {
-            var dialog = new OpenFileDialog
+            string json = "";
-            {
+            Dictionary<string, object>? list = null;
-                Filter = "JSON files|*.json|All files|*.*"
-            };
 
-            if (dialog.ShowDialog() != true)
+            while (list is null)
-                return;
+            { 
+                var dialog = new BulkAddFastFlagDialog();
+                dialog.JsonTextBox.Text = json;
+                dialog.ShowDialog();
 
-            try
+                if (dialog.Result != MessageBoxResult.OK)
-            {
+                    return;
-                var list = JsonSerializer.Deserialize<Dictionary<string, object>>(File.ReadAllText(dialog.FileName));
 
-                if (list is null)
+                json = dialog.JsonTextBox.Text;
-                    throw new Exception("JSON deserialization returned null");
 
-                var conflictingFlags = App.FastFlags.Prop.Where(x => list.ContainsKey(x.Key)).Select(x => x.Key);
+                try
-                bool overwriteConflicting = false;
-
-                if (conflictingFlags.Any())
                 {
-                    var result = Controls.ShowMessageBox(
+                    list = JsonSerializer.Deserialize<Dictionary<string, object>>(json);
-                        "Some of the flags you are attempting to import already have set values. Would you like to overwrite their current values with the ones defined in the import?\n" +
+
+                    if (list is null)
+                        throw new Exception("JSON deserialization returned null");
+                }
+                catch (Exception ex) 
+                {
+                    Controls.ShowMessageBox(
+                        "The JSON you've entered does not appear to be valid. Please double check it and try again.\n" +
                         "\n" +
-                        "Conflicting flags:\n" +
+                        "More information:\n" +
-                        String.Join(", ", conflictingFlags),
+                        $"{ex.Message}",
-                        MessageBoxImage.Question,
+                        MessageBoxImage.Error
-                        MessageBoxButton.YesNo
                     );
-
-                    overwriteConflicting = result == MessageBoxResult.Yes;
                 }
-
-                foreach (var pair in list)
-                {
-                    if (App.FastFlags.Prop.ContainsKey(pair.Key) && !overwriteConflicting)
-                        continue;
-
-                    App.FastFlags.SetValue(pair.Key, pair.Value);
-                }
-
-                ClearSearch();
             }
-            catch (Exception ex)
+
+            var conflictingFlags = App.FastFlags.Prop.Where(x => list.ContainsKey(x.Key)).Select(x => x.Key);
+            bool overwriteConflicting = false;
+
+            if (conflictingFlags.Any())
             {
-                Controls.ShowMessageBox(
+                var result = Controls.ShowMessageBox(
-                    "The file you've selected does not appear to be valid JSON. Please double check the file contents and try again.\n" +
+                    "Some of the flags you are attempting to import already have set values. Would you like to overwrite their current values with the ones defined in the import?\n" +
-                    "\n" + 
+                    "\n" +
-                    "More information:\n" +
+                    "Conflicting flags:\n" +
-                    $"{ex.Message}",
+                    String.Join(", ", conflictingFlags),
-                    MessageBoxImage.Error
+                    MessageBoxImage.Question,
+                    MessageBoxButton.YesNo
                 );
+
+                overwriteConflicting = result == MessageBoxResult.Yes;
             }
+
+            foreach (var pair in list)
+            {
+                if (App.FastFlags.Prop.ContainsKey(pair.Key) && !overwriteConflicting)
+                    continue;
+
+                App.FastFlags.SetValue(pair.Key, pair.Value);
+            }
+
+            ClearSearch();
         }
 
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)

Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml

@@ -1,66 +1,79 @@
 <ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.InstallationPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:models="clr-namespace:Bloxstrap.UI.ViewModels"
       xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-      mc:Ignorable="d"
+      xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Menu.Pages"
+      xmlns:models="clr-namespace:Bloxstrap.UI.ViewModels"
+      xmlns:viewmodels="clr-namespace:Bloxstrap.UI.ViewModels.Menu"
+      d:DataContext="{d:DesignInstance Type=viewmodels:InstallationViewModel}"
+      mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="InstallationPage"
+      Title="InstallationPage">
-      Scrollable="True">
-  <StackPanel Margin="0,0,14,14">
-    <TextBlock Text="Configure how Bloxstrap/Roblox is installed." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
 
-    <ui:CardExpander Margin="0,16,0,0" IsExpanded="True">
+    <StackPanel Margin="0,0,14,14">
-      <ui:CardExpander.Header>
+        <TextBlock Text="Configure how Bloxstrap/Roblox is installed." FontSize="14" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
-        <StackPanel>
-          <TextBlock FontSize="14" Text="Install Location" />
-          <TextBlock Margin="0,2,0,0" FontSize="12" Text="Choose where Bloxstrap should be installed to." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-        </StackPanel>
-      </ui:CardExpander.Header>
-      <Grid>
-        <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="*" />
-          <ColumnDefinition Width="Auto" />
-          <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <TextBox Grid.Column="0" Margin="0,0,4,0" Text="{Binding InstallLocation, Mode=TwoWay}" />
-        <ui:Button Grid.Column="1" Margin="4,0,4,0" Height="35" Icon="Folder24" Content="Browse" Command="{Binding BrowseInstallLocationCommand}" />
-        <ui:Button Grid.Column="2" Margin="4,0,0,0" Height="35" Icon="ArrowCounterclockwise24" Content="Reset" Command="{Binding ResetInstallLocationCommand}" />
-      </Grid>
-    </ui:CardExpander>
 
-    <Grid Margin="0,8,0,0">
+        <ui:CardExpander Margin="0,16,0,0" IsExpanded="True">
-      <Grid.Style>
+            <ui:CardExpander.Style>
-        <Style TargetType="Grid">
+                <Style TargetType="ui:CardExpander" BasedOn="{StaticResource {x:Type ui:CardExpander}}">
-          <Setter Property="Visibility" Value="Collapsed" />
+                    <Setter Property="Visibility" Value="Collapsed" />
-          <Style.Triggers>
+                    <Style.Triggers>
-            <DataTrigger Binding="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}}" Value="True">
+                        <DataTrigger Binding="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}}" Value="False">
-              <Setter Property="Visibility" Value="Visible" />
+                            <Setter Property="Visibility" Value="Visible" />
-            </DataTrigger>
+                        </DataTrigger>
-          </Style.Triggers>
+                    </Style.Triggers>
-        </Style>
+                </Style>
-      </Grid.Style>
+            </ui:CardExpander.Style>
-      
+            <ui:CardExpander.Header>
-      <Grid.ColumnDefinitions>
+                <StackPanel>
-        <ColumnDefinition Width="*" />
+                    <TextBlock FontSize="14" Text="Install Location" />
-        <ColumnDefinition Width="*" />
+                    <TextBlock Margin="0,2,0,0" FontSize="12" Text="Choose where Bloxstrap should be installed to." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
-      </Grid.ColumnDefinitions>
+                </StackPanel>
+            </ui:CardExpander.Header>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <TextBox Grid.Column="0" Margin="0,0,4,0" Text="{Binding InstallLocation, Mode=TwoWay}" />
+                <ui:Button Grid.Column="1" Margin="4,0,4,0" Height="35" Icon="Folder24" Content="Browse" Command="{Binding BrowseInstallLocationCommand}" />
+                <ui:Button Grid.Column="2" Margin="4,0,0,0" Height="35" Icon="ArrowCounterclockwise24" Content="Reset" Command="{Binding ResetInstallLocationCommand}" />
+            </Grid>
+        </ui:CardExpander>
 
-      <ui:CardAction Grid.Column="0" x:Name="OpenFolderCardAction" Margin="0,0,4,0" Icon="Folder24" Command="{Binding OpenFolderCommand}" >
+        <Grid Margin="0,8,0,0">
-        <StackPanel>
+            <Grid.Style>
-          <TextBlock FontSize="14" Text="Open Installation Folder" />
+                <Style TargetType="Grid">
-          <TextBlock Margin="0,2,0,0" FontSize="12" Text="Where Bloxstrap is currently installed to." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+                    <Setter Property="Visibility" Value="Collapsed" />
-        </StackPanel>
+                    <Style.Triggers>
-      </ui:CardAction>
+                        <DataTrigger Binding="{Binding Source={x:Static models:GlobalViewModel.IsNotFirstRun}}" Value="True">
+                            <Setter Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Grid.Style>
 
-      <ui:CardAction Grid.Column="1" Margin="4,0,0,0" Icon="UninstallApp24" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/Uninstalling-Bloxstrap">
+            <Grid.ColumnDefinitions>
-        <StackPanel>
+                <ColumnDefinition Width="*" />
-          <TextBlock FontSize="14" Text="Looking to uninstall?" />
+                <ColumnDefinition Width="*" />
-          <TextBlock Margin="0,2,0,0" FontSize="12" Text="Here's a guide on how to uninstall Bloxstrap." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+            </Grid.ColumnDefinitions>
-        </StackPanel>
+
-      </ui:CardAction>
+            <ui:CardAction Grid.Column="0" x:Name="OpenFolderCardAction" Margin="0,0,4,0" Icon="Folder24" Command="{Binding OpenFolderCommand}" >
-    </Grid>
+                <StackPanel>
-  </StackPanel>
+                    <TextBlock FontSize="14" Text="Open Installation Folder" />
+                    <TextBlock Margin="0,2,0,0" FontSize="12" Text="Where Bloxstrap is currently installed to." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+                </StackPanel>
+            </ui:CardAction>
+
+            <ui:CardAction Grid.Column="1" Margin="4,0,0,0" Icon="UninstallApp24" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/Uninstalling-Bloxstrap">
+                <StackPanel>
+                    <TextBlock FontSize="14" Text="Looking to uninstall?" />
+                    <TextBlock Margin="0,2,0,0" FontSize="12" Text="Here's a guide on how to uninstall Bloxstrap." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+                </StackPanel>
+            </ui:CardAction>
+        </Grid>
+    </StackPanel>
 </ui:UiPage>

Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml.cs

@@ -1,4 +1,19 @@
-using Bloxstrap.UI.ViewModels.Menu;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+using Bloxstrap.UI.ViewModels.Menu;
 
 namespace Bloxstrap.UI.Elements.Menu.Pages
 {

Bloxstrap/UI/ViewModels/ContextMenu/ServerInformationViewModel.cs

@@ -30,6 +30,6 @@ namespace Bloxstrap.UI.ViewModels.ContextMenu
             });
         }
 
-        private void CopyInstanceId() => Clipboard.SetText(InstanceId);
+        private void CopyInstanceId() => Clipboard.SetDataObject(InstanceId);
     }
 }

Bloxstrap/UI/ViewModels/Menu/BehaviourViewModel.cs

@@ -81,18 +81,12 @@
             set => App.Settings.Prop.CheckForUpdates = value;
         }
 
-        public IEnumerable<string> Channels => RobloxDeployment.SelectableChannels;
-
         public string SelectedChannel
         {
             get => App.Settings.Prop.Channel;
             set
             {
                 value = value.Trim();
-
-                if (String.IsNullOrEmpty(value))
-                    value = RobloxDeployment.DefaultChannel;
-                
                 Task.Run(() => LoadChannelDeployInfo(value));
                 App.Settings.Prop.Channel = value;
             }

Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs

@@ -112,8 +112,11 @@ namespace Bloxstrap.UI.ViewModels.Menu
 
                     foreach (var flag in version.Value)
                     {
-                        if (App.FastFlags.GetPreset($"UI.Menu.Style.{flag.Key}") != flag.Value)
+                        foreach (var presetFlag in FastFlagManager.PresetFlags.Where(x => x.Key.StartsWith($"UI.Menu.Style.{flag.Key}")))
-                            flagsMatch = false;
+                        { 
+                            if (App.FastFlags.GetValue(presetFlag.Value) != flag.Value)
+                                flagsMatch = false;
+                        }
                     }
 
                     if (flagsMatch)

Bloxstrap/UI/ViewModels/Menu/MainWindowViewModel.cs

@@ -14,8 +14,6 @@ namespace Bloxstrap.UI.ViewModels.Menu
     public class MainWindowViewModel : NotifyPropertyChangedViewModel
     {
         private readonly Window _window;
-        private readonly IDialogService _dialogService;
-        private readonly string _originalBaseDirectory = App.BaseDirectory; // we need this to check if the basedirectory changes
 
         public ICommand CloseWindowCommand => new RelayCommand(CloseWindow);
         public ICommand ConfirmSettingsCommand => new RelayCommand(ConfirmSettings);
@@ -24,25 +22,31 @@ namespace Bloxstrap.UI.ViewModels.Menu
         public string ConfirmButtonText => App.IsFirstRun ? "Install" : "Save";
         public bool ConfirmButtonEnabled { get; set; } = true;
 
-        public MainWindowViewModel(Window window, IDialogService dialogService)
+        public MainWindowViewModel(Window window)
         {
             _window = window;
-            _dialogService = dialogService;
         }
 
         private void CloseWindow() => _window.Close();
 
         private void ConfirmSettings()
         {
+            if (!App.IsFirstRun)
+            {
+                App.ShouldSaveConfigs = true;
+                App.FastFlags.Save();
+                CloseWindow();
+
+                return;
+            }
+
             if (string.IsNullOrEmpty(App.BaseDirectory))
             {
                 Controls.ShowMessageBox("You must set an install location", MessageBoxImage.Error);
                 return;
             }
 
-            bool shouldCheckInstallLocation = App.IsFirstRun || App.BaseDirectory != _originalBaseDirectory;
+            if (NavigationVisibility == Visibility.Visible)
-
-            if (shouldCheckInstallLocation && NavigationVisibility == Visibility.Visible)
             {
                 try
                 {
@@ -87,54 +91,45 @@ namespace Bloxstrap.UI.ViewModels.Menu
                     else if (result == MessageBoxResult.Cancel)
                         return;
                 }
+
+                if (
+                    App.BaseDirectory.Length <= 3 || // prevent from installing to the root of a drive
+                    App.BaseDirectory.StartsWith("\\\\") || // i actually haven't encountered anyone doing this and i dont even know if this is possible but this is just to be safe lmao
+                    App.BaseDirectory.ToLowerInvariant().Contains("onedrive") || // prevent from installing to a onedrive folder
+                    Directory.GetParent(App.BaseDirectory)!.ToString().ToLowerInvariant() == Paths.UserProfile.ToLowerInvariant() // prevent from installing to an essential user profile folder
+                )
+                {
+                    Controls.ShowMessageBox(
+                        $"{App.ProjectName} cannot be installed here. Please choose a different location, or resort to using the default location by clicking the reset button.",
+                        MessageBoxImage.Error,
+                        MessageBoxButton.OK
+                    );
+
+                    return;
+                }
             }
-
+            
-            if (App.IsFirstRun)
+            if (NavigationVisibility == Visibility.Visible)
             {
-                if (NavigationVisibility == Visibility.Visible)
+                ((INavigationWindow)_window).Navigate(typeof(PreInstallPage));
-                {
-                    ((INavigationWindow)_window).Navigate(typeof(PreInstallPage));
 
-                    NavigationVisibility = Visibility.Collapsed;
+                NavigationVisibility = Visibility.Collapsed;
-                    OnPropertyChanged(nameof(NavigationVisibility));
+                OnPropertyChanged(nameof(NavigationVisibility));
                     
-                    ConfirmButtonEnabled = false;
+                ConfirmButtonEnabled = false;
-                    OnPropertyChanged(nameof(ConfirmButtonEnabled));
+                OnPropertyChanged(nameof(ConfirmButtonEnabled));
 
-                    Task.Run(async delegate
+                Task.Run(async delegate
-                    {
-                        await Task.Delay(3000);
-
-                        ConfirmButtonEnabled = true;
-                        OnPropertyChanged(nameof(ConfirmButtonEnabled));
-                    });
-                }
-                else
                 {
-                    App.IsSetupComplete = true;
+                    await Task.Delay(3000);
-                    CloseWindow();
+                    
-                }
+                    ConfirmButtonEnabled = true;
+                    OnPropertyChanged(nameof(ConfirmButtonEnabled));
+                });
             }
             else
             {
-                App.ShouldSaveConfigs = true;
+                App.IsSetupComplete = true;
-                App.FastFlags.Save();
-
-                if (shouldCheckInstallLocation)
-                {
-                    App.Logger.WriteLine("MainWindowViewModel::ConfirmSettings", $"Changing install location from {_originalBaseDirectory} to {App.BaseDirectory}");
-
-                    Controls.ShowMessageBox(
-                        $"{App.ProjectName} will install to the new location you've set the next time it runs.",
-                        MessageBoxImage.Information
-                    );
-
-                    using RegistryKey registryKey = Registry.CurrentUser.CreateSubKey($@"Software\{App.ProjectName}");
-                    registryKey.SetValue("InstallLocation", App.BaseDirectory);
-                    registryKey.SetValue("OldInstallLocation", _originalBaseDirectory);
-                    Paths.Initialize(App.BaseDirectory);
-                }
-
                 CloseWindow();
             }
         }

Bloxstrap/Utility/AsyncMutex.cs

@@ -4,13 +4,15 @@
 
     public sealed class AsyncMutex : IAsyncDisposable
     {
+        private readonly bool _initiallyOwned;
         private readonly string _name;
         private Task? _mutexTask;
         private ManualResetEventSlim? _releaseEvent;
         private CancellationTokenSource? _cancellationTokenSource;
 
-        public AsyncMutex(string name)
+        public AsyncMutex(bool initiallyOwned, string name)
         {
+            _initiallyOwned = initiallyOwned;
             _name = name;
         }
 
@@ -31,7 +33,7 @@
                     try
                     {
                         CancellationToken cancellationToken = _cancellationTokenSource.Token;
-                        using var mutex = new Mutex(false, _name);
+                        using var mutex = new Mutex(_initiallyOwned, _name);
                         try
                         {
                             // Wait for either the mutex to be acquired, or cancellation