From 4bb06873d53d4459268e13305788cb9996d373ec Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Sat, 14 May 2022 21:54:52 +0300
Subject: [PATCH] Move badge hierarchy declaration to constructor for safer
 access

---
 osu.Game/Overlays/BeatmapSet/BeatmapBadge.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapBadge.cs b/osu.Game/Overlays/BeatmapSet/BeatmapBadge.cs
index d19aff3a69..a75fc8e888 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapBadge.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapBadge.cs
@@ -32,26 +32,22 @@ public Colour4 BadgeColour
             set => badgeLabel.Colour = value;
         }
 
-        private OsuSpriteText badgeLabel = null!;
+        private readonly Box background;
+        private readonly OsuSpriteText badgeLabel;
 
         protected BeatmapBadge()
         {
             AutoSizeAxes = Axes.Both;
-        }
 
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, OverlayColourProvider? colourProvider)
-        {
             InternalChild = new CircularContainer
             {
                 Masking = true,
                 AutoSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    new Box
+                    background = new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider?.Background5 ?? colours.Gray2,
                     },
                     badgeLabel = new OsuSpriteText
                     {
@@ -61,5 +57,11 @@ private void load(OsuColour colours, OverlayColourProvider? colourProvider)
                 }
             };
         }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuColour colours, OverlayColourProvider? colourProvider)
+        {
+            background.Colour = colourProvider?.Background5 ?? colours.Gray2;
+        }
     }
 }