From bf239f8bef321dbb90e61ebe8e453a13a22f11c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 4 Feb 2021 19:12:37 +0900
Subject: [PATCH] Flush animation on closing mod overlay

---
 osu.Game/Overlays/Mods/ModSection.cs       | 9 +++++++++
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs
index 353f779b4f..440abfb1c0 100644
--- a/osu.Game/Overlays/Mods/ModSection.cs
+++ b/osu.Game/Overlays/Mods/ModSection.cs
@@ -231,5 +231,14 @@ namespace osu.Game.Overlays.Mods
             Font = OsuFont.GetFont(weight: FontWeight.Bold),
             Text = text
         };
+
+        /// <summary>
+        /// Play out all remaining animations immediately to leave mods in a good (final) state.
+        /// </summary>
+        public void FlushAnimation()
+        {
+            while (pendingSelectionOperations.TryDequeue(out var dequeuedAction))
+                dequeuedAction();
+        }
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 4f65a39ed3..93fe693937 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -379,6 +379,11 @@ namespace osu.Game.Overlays.Mods
         {
             base.PopOut();
 
+            foreach (var section in ModSectionsContainer)
+            {
+                section.FlushAnimation();
+            }
+
             FooterContainer.MoveToX(content_width, WaveContainer.DISAPPEAR_DURATION, Easing.InSine);
             FooterContainer.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.InSine);