sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on trying to retrieve mods from unavailable ruleset (#7211)

Browse Source 
Fix crash on trying to retrieve mods from unavailable ruleset
This commit is contained in:
Dean Herbert
2019-12-15 03:18:14 +09:00
committed by GitHub
parent 63c13ca1eb 244eb56455
commit 23ea6c1e6c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
View File

@ -84,6 +84,11 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
public override Ruleset CreateInstance() => new TestCustomisableModRuleset(); public override Ruleset CreateInstance() => new TestCustomisableModRuleset();
public TestRulesetInfo()
{
Available = true;
}
public class TestCustomisableModRuleset : Ruleset public class TestCustomisableModRuleset : Ruleset
{ {
public override IEnumerable<Mod> GetModsFor(ModType type) public override IEnumerable<Mod> GetModsFor(ModType type)

7
osu.Game/OsuGameBase.cs
View File

@ -246,8 +246,11 @@ namespace osu.Game
{ {
var dict = new Dictionary<ModType, IReadOnlyList<Mod>>(); var dict = new Dictionary<ModType, IReadOnlyList<Mod>>();
foreach (ModType type in Enum.GetValues(typeof(ModType))) if (r.NewValue?.Available == true)
dict[type] = r.NewValue?.CreateInstance().GetModsFor(type).ToList(); {
foreach (ModType type in Enum.GetValues(typeof(ModType)))
dict[type] = r.NewValue.CreateInstance().GetModsFor(type).ToList();
}
if (!SelectedMods.Disabled) if (!SelectedMods.Disabled)
SelectedMods.Value = Array.Empty<Mod>(); SelectedMods.Value = Array.Empty<Mod>();