From 6f2ebb20a7fedc0d02037540b3610e7e64288239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 18 Apr 2021 20:29:09 +0200
Subject: [PATCH] Fix test failing due to null beatmap skin

Also annotate the field on `EditorBeatmap` as nullable for future
travelers.
---
 osu.Game/Screens/Edit/EditorBeatmap.cs        | 1 +
 osu.Game/Screens/Edit/Setup/ColoursSection.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 4f1b0484d2..4bf4a3b8f3 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -46,6 +46,7 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
+        [CanBeNull]
         public readonly ISkin BeatmapSkin;
 
         [Resolved]
diff --git a/osu.Game/Screens/Edit/Setup/ColoursSection.cs b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
index 91dfd74a78..cb7deadcb7 100644
--- a/osu.Game/Screens/Edit/Setup/ColoursSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ColoursSection.cs
@@ -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)
                 comboColours.Colours.AddRange(colours);
         }