SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix GetPreset crash after updating Bloxstrap
This commit is contained in:
Matt 2024-12-04 17:40:02 +00:00 committed by GitHub
commit 1d799a68f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Bloxstrap/FastFlagManager.cs
View File

@ -207,7 +207,17 @@ namespace Bloxstrap
} }
} }
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 public T GetPresetEnum<T>(IReadOnlyDictionary<T, string> mapping, string prefix, string value) where T : Enum
{ {

36
Bloxstrap/Installer.cs
View File

@ -477,21 +477,6 @@ namespace Bloxstrap
App.FastFlags.SetValue("DFFlagVariableDPIScale2", null); 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 (Utilities.CompareVersions(existingVer, "2.6.0") == VersionComparison.LessThan)
{ {
if (App.Settings.Prop.UseDisableAppPatch) if (App.Settings.Prop.UseDisableAppPatch)
@ -556,28 +541,7 @@ namespace Bloxstrap
WindowsRegistry.RegisterPlayer(); 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); App.FastFlags.SetValue("FFlagFixGraphicsQuality", null);
try try