From 4c1f00567bd25e3506bb5dba1c4031a24e5c0845 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Dec 2017 11:31:38 +0900
Subject: [PATCH] Fix incorrect flush logic when starting play from
 non-selected difficulty using context menu

---
 osu.Game/Screens/Select/SongSelect.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index b5fba7d88d..4d5101447a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -214,6 +214,8 @@ namespace osu.Game.Screens.Select
             // it could change selection (ie. if the ruleset has been changed).
             carousel.FlushPendingFilterOperations();
 
+            carousel.SelectBeatmap(beatmap);
+
             if (selectionChangedDebounce?.Completed == false)
             {
                 selectionChangedDebounce.RunTask();
@@ -221,8 +223,6 @@ namespace osu.Game.Screens.Select
                 selectionChangedDebounce = null;
             }
 
-            carousel.SelectBeatmap(beatmap);
-
             Start();
         }