From 52db7b36fc44a66d64a5b68d5a266ece48a2cebc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 21 Dec 2021 12:55:21 +0900
Subject: [PATCH] Move `Schedule` call to base implementation of error meter
 for extra safety

---
 .../Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs | 4 ++--
 osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs  | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index 00e6059541..5012be7249 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -53,13 +53,13 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 LayoutEasing = Easing.OutQuint;
             }
 
-            public void Push(Color4 colour) => Schedule(() =>
+            public void Push(Color4 colour)
             {
                 Add(new HitErrorCircle(colour, drawable_judgement_size));
 
                 if (Children.Count > max_available_judgements)
                     Children.FirstOrDefault(c => !c.IsRemoved)?.Remove();
-            });
+            }
         }
 
         internal class HitErrorCircle : Container
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
index c7b06a3a2c..16c23f07f5 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs
@@ -40,9 +40,14 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             if (gameplayClockContainer != null)
                 gameplayClockContainer.OnSeek += Clear;
 
-            processor.NewJudgement += OnNewJudgement;
+            // Scheduled as meter implementations are likely going to change/add drawables when reacting to this.
+            processor.NewJudgement += j => Schedule(() => OnNewJudgement(j));
         }
 
+        /// <summary>
+        /// Fired when a new judgement arrives.
+        /// </summary>
+        /// <param name="judgement">The new judgement.</param>
         protected abstract void OnNewJudgement(JudgementResult judgement);
 
         protected Color4 GetColourForHitResult(HitResult result)