sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel

Browse Source
This commit is contained in:
Jamie Taylor
2019-03-07 17:01:24 +09:00
parent 50c1b3a576 c9ca5098d9
commit c34e110a2c
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Screens/Select/MatchSongSelect.cs
View File

@ -61,9 +61,12 @@ namespace osu.Game.Screens.Select
if (base.OnExiting(next))
return true;
Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value?.Beatmap);
Beatmap.Value.Mods.Value = selectedMods.Value = CurrentItem.Value?.RequiredMods ?? Enumerable.Empty<Mod>();
Ruleset.Value = CurrentItem.Value?.Ruleset;
if (CurrentItem.Value != null)
{
Ruleset.Value = CurrentItem.Value.Ruleset;
Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value.Beatmap);
Beatmap.Value.Mods.Value = selectedMods.Value = CurrentItem.Value.RequiredMods ?? Enumerable.Empty<Mod>();
}
Beatmap.Disabled = true;
Ruleset.Disabled = true;