Merge branch 'main' into bugfix/you-forgot-to-use-strings-resx

Bloxstrap/Bootstrapper.cs

@@ -753,8 +753,7 @@ namespace Bloxstrap
 
             List<string> modFolderFiles = new();
 
-            if (!Directory.Exists(Paths.Modifications))
+            Directory.CreateDirectory(Paths.Modifications);
-                Directory.CreateDirectory(Paths.Modifications);
 
             // check custom font mod
             // instead of replacing the fonts themselves, we'll just alter the font family manifests

Bloxstrap/Integrations/ActivityWatcher.cs

@@ -36,7 +36,6 @@
         public event EventHandler? OnAppClose;
         public event EventHandler<Message>? OnRPCMessage;
 
-        private readonly Dictionary<string, string> GeolocationCache = new();
         private DateTime LastRPCRequest;
 
         public string LogLocation = null!;

Bloxstrap/JsonManager.cs

@@ -60,7 +60,21 @@ namespace Bloxstrap
             App.Logger.WriteLine(LOG_IDENT, $"Saving to {FileLocation}...");
 
             Directory.CreateDirectory(Path.GetDirectoryName(FileLocation)!);
-            File.WriteAllText(FileLocation, JsonSerializer.Serialize(Prop, new JsonSerializerOptions { WriteIndented = true }));
+
+            try
+            {
+                File.WriteAllText(FileLocation, JsonSerializer.Serialize(Prop, new JsonSerializerOptions { WriteIndented = true }));
+            }
+            catch (IOException ex)
+            {
+                App.Logger.WriteLine(LOG_IDENT, "Failed to save");
+                App.Logger.WriteException(LOG_IDENT, ex);
+
+                string errorMessage = string.Format(Resources.Strings.Bootstrapper_JsonManagerSaveFailed, ClassName, ex.Message);
+                Frontend.ShowMessageBox(errorMessage, System.Windows.MessageBoxImage.Warning);
+
+                return;
+            }
 
             App.Logger.WriteLine(LOG_IDENT, "Save complete!");
         }

Bloxstrap/Resources/Strings.Designer.cs

@@ -170,6 +170,15 @@ namespace Bloxstrap.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Failed to save {0}: {1}.
+        /// </summary>
+        public static string Bootstrapper_JsonManagerSaveFailed {
+            get {
+                return ResourceManager.GetString("Bootstrapper.JsonManagerSaveFailed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Bloxstrap does not have enough disk space to download and install Roblox. Please free up some disk space and try again..
         /// </summary>

Bloxstrap/Resources/Strings.resx

@@ -1195,4 +1195,7 @@ Please manually delete Bloxstrap.exe from the install location or try restarting
   <data name="Installer.ShouldCancel" xml:space="preserve">
     <value>Are you sure you want to cancel the installation?</value>
   </data>
+  <data name="Bootstrapper.JsonManagerSaveFailed" xml:space="preserve">
+    <value>Failed to save {0}: {1}</value>
+  </data>
 </root>

Bloxstrap/UI/Elements/Settings/Pages/IntegrationsPage.xaml

@@ -89,7 +89,7 @@
                     </Style>
                 </StackPanel.Style>
                 <TextBlock Text="{x:Static resources:Strings.Common_Name}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
-                <ui:TextBox Margin="0,4,0,0" Text="{Binding SelectedCustomIntegration.Name}" />
+                <ui:TextBox Margin="0,4,0,0" Text="{Binding SelectedCustomIntegration.Name, UpdateSourceTrigger=PropertyChanged}" />
                 <TextBlock Margin="0,8,0,0" Text="{x:Static resources:Strings.Menu_Integrations_Custom_AppLocation}" Foreground="{DynamicResource TextFillColorSecondaryBrush}" />
                 <Grid Margin="0,4,0,0">
                     <Grid.ColumnDefinitions>

Bloxstrap/UI/Frontend.cs

@@ -17,20 +17,7 @@ namespace Bloxstrap.UI
             if (App.LaunchSettings.QuietFlag.Active)
                 return defaultResult;
 
-            if (App.LaunchSettings.RobloxLaunchMode != LaunchMode.None)
+            return ShowFluentMessageBox(message, icon, buttons);
-                return ShowFluentMessageBox(message, icon, buttons);
-
-            switch (App.Settings.Prop.BootstrapperStyle)
-            {
-                case BootstrapperStyle.FluentDialog:
-                case BootstrapperStyle.ClassicFluentDialog:
-                case BootstrapperStyle.FluentAeroDialog:
-                case BootstrapperStyle.ByfronDialog:
-                    return ShowFluentMessageBox(message, icon, buttons);
-
-                default:
-                    return MessageBox.Show(message, App.ProjectName, buttons, icon);
-            }
         }
 
         public static void ShowPlayerErrorDialog(bool crash = false)

Bloxstrap/UI/ViewModels/Settings/IntegrationsViewModel.cs

@@ -57,6 +57,7 @@ namespace Bloxstrap.UI.ViewModels.Settings
             if (dialog.ShowDialog() != true)
                 return;
 
+            SelectedCustomIntegration.Name = dialog.SafeFileName;
             SelectedCustomIntegration.Location = dialog.FileName;
             OnPropertyChanged(nameof(SelectedCustomIntegration));
         }

Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs

@@ -108,7 +108,7 @@ namespace Bloxstrap.UI.ViewModels.Settings
             string path = new RobloxPlayerData().ExecutablePath;
 
             if (File.Exists(path))
-               PInvoke.SHObjectProperties(HWND.Null, SHOP_TYPE.SHOP_FILEPATH, path, "Compatibility");
+                PInvoke.SHObjectProperties(HWND.Null, SHOP_TYPE.SHOP_FILEPATH, path, "Compatibility");
             else
                 Frontend.ShowMessageBox(Strings.Common_RobloxNotInstalled, MessageBoxImage.Error);
 

Bloxstrap/Utilities.cs

@@ -50,7 +50,6 @@ namespace Bloxstrap
 
         public static string GetRobloxVersion(bool studio)
         {
-            string versionGuid = studio ? App.State.Prop.Studio.VersionGuid : App.State.Prop.Player.VersionGuid;
             string fileName = studio ? "Studio/RobloxStudioBeta.exe" : "Player/RobloxPlayerBeta.exe";
 
             string playerLocation = Path.Combine(Paths.Roblox, fileName);