From 5ae3a7143e437a4494e3c6638f1693d613236bda Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 19 May 2017 13:22:53 +0900
Subject: [PATCH] Fix audio seeking when entering play mode in certain cases

Resolves #794
---
 osu.Game/Screens/Select/SongSelect.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 4982ca096f..c352e6e034 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -198,8 +198,11 @@ namespace osu.Game.Screens.Select
             var pendingSelection = selectionChangedDebounce;
             selectionChangedDebounce = null;
 
-            pendingSelection?.RunTask();
-            pendingSelection?.Cancel(); // cancel the already scheduled task.
+            if (pendingSelection?.Completed == false)
+            {
+                pendingSelection?.RunTask();
+                pendingSelection?.Cancel(); // cancel the already scheduled task.
+            }
 
             if (Beatmap == null) return;