From e691dd12c527132ca80276336cf86a7b364179c0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Jul 2017 14:22:14 +0900
Subject: [PATCH] Fix potential sequen of execution issues in BeatmapCarousel

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 10 ++++++++--
 osu.Game/Screens/Select/SongSelect.cs      |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 743a0a0f63..63992915aa 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -107,6 +107,14 @@ namespace osu.Game.Screens.Select
             });
         }
 
+        public void RemoveBeatmap(BeatmapSetInfo beatmapSet)
+        {
+            Schedule(delegate
+            {
+                removeGroup(groups.Find(b => b.BeatmapSet.ID == beatmapSet.ID));
+            });
+        }
+
         public void SelectBeatmap(BeatmapInfo beatmap, bool animated = true)
         {
             if (beatmap == null)
@@ -128,8 +136,6 @@ namespace osu.Game.Screens.Select
             }
         }
 
-        public void RemoveBeatmap(BeatmapSetInfo info) => removeGroup(groups.Find(b => b.BeatmapSet.ID == info.ID));
-
         public Action<BeatmapInfo> SelectionChanged;
 
         public Action StartRequested;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index bbd292870e..d2aec8d919 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -280,7 +280,7 @@ namespace osu.Game.Screens.Select
             carousel.Filter(criteria, debounce);
         }
 
-        private void onBeatmapSetAdded(BeatmapSetInfo s) => carousel.AddBeatmap(s);
+        private void onBeatmapSetAdded(BeatmapSetInfo s) => Schedule(() => addBeatmapSet(s));
 
         private void onBeatmapSetRemoved(BeatmapSetInfo s) => Schedule(() => removeBeatmapSet(s));
 
@@ -375,6 +375,11 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        private void addBeatmapSet(BeatmapSetInfo beatmapSet)
+        {
+            carousel.AddBeatmap(beatmapSet);
+        }
+
         private void removeBeatmapSet(BeatmapSetInfo beatmapSet)
         {
             carousel.RemoveBeatmap(beatmapSet);