From 308ed1abd1353631d98f1c868fd010d0c989b807 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 15 Nov 2022 11:55:33 +0900
Subject: [PATCH] Fix number of judgements shown potentially exceeding upper
 limit

---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs   |  5 +----
 .../HUD/HitErrorMeters/ColourHitErrorMeter.cs   | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 7c668adba5..b90b9b437d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -163,10 +163,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("wait for bars to disappear", () => !this.ChildrenOfType<BarHitErrorMeter.JudgementLine>().Any());
             AddUntilStep("ensure max circles not exceeded", () =>
-            {
-                return this.ChildrenOfType<ColourHitErrorMeter>()
-                           .All(m => m.ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count() <= max_displayed_judgements);
-            });
+                this.ChildrenOfType<ColourHitErrorMeter>().First().ChildrenOfType<ColourHitErrorMeter.HitErrorShape>().Count(), () => Is.LessThanOrEqualTo(max_displayed_judgements));
 
             AddStep("show displays", () =>
             {
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
index b82afe18a6..86ba85168f 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/ColourHitErrorMeter.cs
@@ -102,9 +102,9 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 {
                     shape.Colour = colour;
                     Add(shape);
-                });
 
-                removeExtraJudgements();
+                    removeExtraJudgements();
+                });
             }
 
             private void removeExtraJudgements()
@@ -167,17 +167,20 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             {
                 base.PrepareForUse();
 
-                IsRemoved = false;
-
-                this.FadeIn()
+                this.FadeInFromZero(animation_duration, Easing.OutQuint)
                     // On pool re-use, start flow animation from (0,0).
                     .MoveTo(Vector2.Zero);
 
-                content.FadeInFromZero(animation_duration, Easing.OutQuint)
-                       .MoveToY(-DrawSize.Y)
+                content.MoveToY(-DrawSize.Y)
                        .MoveToY(0, animation_duration, Easing.OutQuint);
             }
 
+            protected override void FreeAfterUse()
+            {
+                base.FreeAfterUse();
+                IsRemoved = false;
+            }
+
             public void Remove()
             {
                 IsRemoved = true;