Merge branch 'master' into safe-area-toggle

This commit is contained in:
Bartłomiej Dach
2022-10-29 13:19:44 +02:00
committed by GitHub
50 changed files with 1005 additions and 560 deletions

View File

@ -282,10 +282,7 @@ namespace osu.Game
configRuleset = LocalConfig.GetBindable<string>(OsuSetting.Ruleset);
uiScale = LocalConfig.GetBindable<float>(OsuSetting.UIScale);
var preferredRuleset = int.TryParse(configRuleset.Value, out int rulesetId)
// int parsing can be removed 20220522
? RulesetStore.GetRuleset(rulesetId)
: RulesetStore.GetRuleset(configRuleset.Value);
var preferredRuleset = RulesetStore.GetRuleset(configRuleset.Value);
try
{