Hot-Fixes Merge

SoapboxRaceWorld · Jul 2, 2021 · c992905 · c992905
2 parents 4c95d1b + 001830c
commit c992905
Show file tree

Hide file tree

Showing 12 changed files with 202 additions and 158 deletions.
diff --git a/GameLauncher/App/Classes/LauncherCore/InsiderKit/KitEnabler.cs b/GameLauncher/App/Classes/LauncherCore/InsiderKit/KitEnabler.cs
@@ -4,7 +4,7 @@
     class InsiderInfo
     {
         /* Current month, day, year (2 digits), and letter! Ex: 12-15-20-A */
-        public static string InsiderBuildNumber = "07-01-21-A";
+        public static string InsiderBuildNumber = "07-02-21-A";
 
         public static string BuildNumberOnly()
         {

diff --git a/GameLauncher/App/Classes/SystemPlatform/Windows/RedistributablePackage.cs b/GameLauncher/App/Classes/SystemPlatform/Windows/RedistributablePackage.cs
@@ -5,7 +5,6 @@
 using System.Windows.Forms;
 using GameLauncher.App.Classes.LauncherCore.Global;
 using GameLauncher.App.Classes.LauncherCore.RPC;
-using GameLauncher.App.Classes.LauncherCore.Visuals;
 using GameLauncher.App.Classes.Logger;
 using GameLauncher.App.Classes.SystemPlatform.Components;
 using GameLauncher.App.Classes.SystemPlatform.Linux;

diff --git a/GameLauncher/App/MainScreen.cs b/GameLauncher/App/MainScreen.cs
@@ -1944,7 +1944,17 @@ private void LaunchGame()
                         ExtractingProgress.Width = 519;
 
                         PlayProgressTextTimer.Text = string.Empty;
-                        PlayProgressText.Text = "Loading game. Launcher will minimize once Game has Loaded".ToUpper();
+                        if (this.PlayProgressText.InvokeRequired)
+                        {
+                            PlayProgressText.Invoke(new Action(delegate ()
+                            {
+                                PlayProgressText.Text = Text = "Loading game. Launcher will minimize once Game has Loaded".ToUpper();
+                            }));
+                        }
+                        else
+                        {
+                            PlayProgressText.Text = "Loading game. Launcher will minimize once Game has Loaded".ToUpper();
+                        }
 
                         ContextMenu = new ContextMenu();
                         ContextMenu.MenuItems.Add(new MenuItem("Donate", (b, n) => { Process.Start("https://paypal.me/metonator95"); }));

diff --git a/GameLauncher/App/SettingsScreen.cs b/GameLauncher/App/SettingsScreen.cs
@@ -620,7 +620,6 @@ private void SettingsSave_Click(object sender, EventArgs e)
                 Log.Error("SETTINGS: Selected CDN does not contain a URL, Unable to Save Contents");
             }
 
-
             String disableProxy = (SettingsProxyCheckbox.Checked == true) ? "1" : "0";
             if (FileSettingsSave.Proxy != disableProxy)
             {
@@ -676,31 +675,49 @@ private void SettingsSave_Click(object sender, EventArgs e)
             }
 
             /* Delete/Enable profwords filter here */
-            if (SettingsWordFilterCheck.Checked)
+            try
             {
-                if (File.Exists(FileSettingsSave.GameInstallation + "/profwords")) File.Move(FileSettingsSave.GameInstallation + "/profwords", FileSettingsSave.GameInstallation + "/profwords_dis");
+                if (SettingsWordFilterCheck.Checked)
+                {
+                    if (File.Exists(FileSettingsSave.GameInstallation + "/profwords")) File.Move(FileSettingsSave.GameInstallation + "/profwords", FileSettingsSave.GameInstallation + "/profwords_dis");
+                }
+                else
+                {
+                    if (File.Exists(FileSettingsSave.GameInstallation + "/profwords_dis")) File.Move(FileSettingsSave.GameInstallation + "/profwords_dis", FileSettingsSave.GameInstallation + "/profwords");
+                }
             }
-            else
+            catch (Exception Error)
             {
-                if (File.Exists(FileSettingsSave.GameInstallation + "/profwords_dis")) File.Move(FileSettingsSave.GameInstallation + "/profwords_dis", FileSettingsSave.GameInstallation + "/profwords");
+                Log.Error("SETTINGS SAVE:" + Error.Message);
             }
 
             /* Create Custom Settings.ini for LangPicker.asi module */
             if (((LangObject)SettingsLanguage.SelectedItem).Category == "Custom") 
             {
                 if (!Directory.Exists(FileSettingsSave.GameInstallation + "/scripts")) 
                 {
-                    Directory.CreateDirectory(FileSettingsSave.GameInstallation + "/scripts");
+                    try
+                    {
+                        Directory.CreateDirectory(FileSettingsSave.GameInstallation + "/scripts");
+                    }
+                    catch {}
+                }
+                try
+                {
+                    IniFile LanguagePickerFile = new IniFile(FileSettingsSave.GameInstallation + "/scripts/LangPicker.ini");
+                    LanguagePickerFile.Write("Language", ((LangObject)SettingsLanguage.SelectedItem).INI_Value);
                 }
-
-                IniFile LanguagePickerFile = new IniFile(FileSettingsSave.GameInstallation + "/scripts/LangPicker.ini");
-                LanguagePickerFile.Write("Language", ((LangObject)SettingsLanguage.SelectedItem).INI_Value);
-            } 
-            else 
+                catch {}
+            }
+            else
             {
                 if (File.Exists(FileSettingsSave.GameInstallation + "/scripts/LangPicker.ini")) 
                 {
-                    File.Delete(FileSettingsSave.GameInstallation + "/scripts/LangPicker.ini");
+                    try
+                    {
+                        File.Delete(FileSettingsSave.GameInstallation + "/scripts/LangPicker.ini");
+                    }
+                    catch{}
                 }
             }