From 9b938f333de39b0d497cab545f4e0719e17c9b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 20 Feb 2024 17:25:11 +0100
Subject: [PATCH] Fix test failures

---
 osu.Game/Overlays/MedalOverlay.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs
index 3601566dda..072d7db6c7 100644
--- a/osu.Game/Overlays/MedalOverlay.cs
+++ b/osu.Game/Overlays/MedalOverlay.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Overlays
         private IAPIProvider api { get; set; } = null!;
 
         private Container<Drawable> medalContainer = null!;
+        private MedalAnimation? lastAnimation;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -54,7 +55,7 @@ namespace osu.Game.Overlays
 
             OverlayActivationMode.BindValueChanged(val =>
             {
-                if (val.NewValue == OverlayActivation.All && (queuedMedals.Any() || medalContainer.Any()))
+                if (val.NewValue == OverlayActivation.All && (queuedMedals.Any() || medalContainer.Any() || lastAnimation?.IsLoaded == false))
                     Show();
             }, true);
         }
@@ -89,21 +90,21 @@ namespace osu.Game.Overlays
         {
             base.Update();
 
-            if (medalContainer.Any())
+            if (medalContainer.Any() || lastAnimation?.IsLoaded == false)
                 return;
 
-            if (!queuedMedals.TryDequeue(out var medal))
+            if (!queuedMedals.TryDequeue(out lastAnimation))
             {
                 Hide();
                 return;
             }
 
-            LoadComponentAsync(medal, medalContainer.Add);
+            LoadComponentAsync(lastAnimation, medalContainer.Add);
         }
 
         protected override bool OnClick(ClickEvent e)
         {
-            (medalContainer.FirstOrDefault(anim => anim.IsAlive) as MedalAnimation)?.Dismiss();
+            lastAnimation?.Dismiss();
             return true;
         }
 
@@ -111,7 +112,7 @@ namespace osu.Game.Overlays
         {
             if (e.Action == GlobalAction.Back)
             {
-                (medalContainer.FirstOrDefault(anim => anim.IsAlive) as MedalAnimation)?.Dismiss();
+                lastAnimation?.Dismiss();
                 return true;
             }