Merge pull request #3862 from bloxstraplabs/bugfix/getpreset-crash

Fix GetPreset crash after updating Bloxstrap
bloxstraplabs · Dec 4, 2024 · 1d799a6 · 1d799a6
2 parents 6d7ed7d + 7f7b488
commit 1d799a6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 38 deletions.
diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs
@@ -207,7 +207,17 @@ public void SetPresetEnum(string prefix, string target, object? value)
             }
         }
 
-        public string? GetPreset(string name) => GetValue(PresetFlags[name]);
+        public string? GetPreset(string name)
+        {
+            if (!PresetFlags.ContainsKey(name))
+            {
+                App.Logger.WriteLine("FastFlagManager::GetPreset", $"Could not find preset {name}");
+                Debug.Assert(false, $"Could not find preset {name}");
+                return null;
+            }
+
+            return GetValue(PresetFlags[name]);
+        }
 
         public T GetPresetEnum<T>(IReadOnlyDictionary<T, string> mapping, string prefix, string value) where T : Enum
         {

diff --git a/Bloxstrap/Installer.cs b/Bloxstrap/Installer.cs
@@ -477,21 +477,6 @@ public static void HandleUpgrade()
                     App.FastFlags.SetValue("DFFlagVariableDPIScale2", null);
                 }
 
-                if (Utilities.CompareVersions(existingVer, "2.5.1") == VersionComparison.LessThan)
-                {
-                    App.FastFlags.SetValue("FIntDebugForceMSAASamples", null);
-
-                    if (App.FastFlags.GetPreset("UI.Menu.Style.DisableV2") is not null)
-                        App.FastFlags.SetPreset("UI.Menu.Style.ABTest", false);
-                }
-
-                if (Utilities.CompareVersions(existingVer, "2.5.3") == VersionComparison.LessThan)
-                {
-                    string? val = App.FastFlags.GetPreset("UI.Menu.Style.EnableV4.1");
-                    if (App.FastFlags.GetPreset("UI.Menu.Style.EnableV4.2") != val)
-                        App.FastFlags.SetPreset("UI.Menu.Style.EnableV4.2", val);
-                }
-
                 if (Utilities.CompareVersions(existingVer, "2.6.0") == VersionComparison.LessThan)
                 {
                     if (App.Settings.Prop.UseDisableAppPatch)
@@ -556,28 +541,7 @@ public static void HandleUpgrade()
 
                     WindowsRegistry.RegisterPlayer();
 
-                    string? oldV2Val = App.FastFlags.GetValue("FFlagDisableNewIGMinDUA");
-
-                    if (oldV2Val is not null)
-                    {
-                        if (oldV2Val == "True")
-                        {
-                            App.FastFlags.SetPreset("UI.Menu.Style.V2Rollout", "0");
-
-                            if (App.FastFlags.GetValue("UI.Menu.Style.EnableV4.1") == "False")
-                                App.FastFlags.SetPreset("UI.Menu.Style.ReportButtonCutOff", "False");
-                        }
-                        else
-                        {
-                            App.FastFlags.SetPreset("UI.Menu.Style.V2Rollout", "100");
-                        }
-
-                        if (App.FastFlags.GetPreset("UI.Menu.Style.ABTest.1") is not null)
-                            App.FastFlags.SetPreset("UI.Menu.Style.ABTest", "False");
-
-                        App.FastFlags.SetValue("FFlagDisableNewIGMinDUA", null);
-                    }
-
+                    App.FastFlags.SetValue("FFlagDisableNewIGMinDUA", null);
                     App.FastFlags.SetValue("FFlagFixGraphicsQuality", null);
 
                     try