1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00

Fix test failing due to null beatmap skin

Also annotate the field on `EditorBeatmap` as nullable for future
travelers.
This commit is contained in:
Bartłomiej Dach 2021-04-18 20:29:09 +02:00
parent 07a00cd681
commit 6f2ebb20a7
2 changed files with 2 additions and 1 deletions

View File

@ -46,6 +46,7 @@ namespace osu.Game.Screens.Edit
public readonly IBeatmap PlayableBeatmap; public readonly IBeatmap PlayableBeatmap;
[CanBeNull]
public readonly ISkin BeatmapSkin; public readonly ISkin BeatmapSkin;
[Resolved] [Resolved]

View File

@ -29,7 +29,7 @@ namespace osu.Game.Screens.Edit.Setup
} }
}; };
var colours = Beatmap.BeatmapSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value; var colours = Beatmap.BeatmapSkin?.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
if (colours != null) if (colours != null)
comboColours.Colours.AddRange(colours); comboColours.Colours.AddRange(colours);
} }