From 23d1c89a670b0426d414b197c83b74193c16e3d9 Mon Sep 17 00:00:00 2001
From: MrTheMake <marc.stephan96@hotmail.de>
Date: Sun, 18 Jun 2017 20:12:28 +0200
Subject: [PATCH 1/3] Fix not applying song select preview seek

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

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index dc6dfdfd81..2ff0635be0 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -321,21 +321,19 @@ namespace osu.Game.Screens.Select
             if (beatmap.Equals(Beatmap?.BeatmapInfo))
                 return;
 
-            bool beatmapSetChange = false;
+            bool preview = beatmap.BeatmapSetInfoID != Beatmap.BeatmapInfo.BeatmapSetInfoID;
+
             if (beatmap.BeatmapSetInfoID == selectionChangeNoBounce?.BeatmapSetInfoID)
                 sampleChangeDifficulty.Play();
             else
-            {
                 sampleChangeBeatmap.Play();
-                beatmapSetChange = true;
-            }
 
             selectionChangeNoBounce = beatmap;
 
             selectionChangedDebounce = Scheduler.AddDelayed(delegate
             {
                 Beatmap = database.GetWorkingBeatmap(beatmap, Beatmap);
-                ensurePlayingSelected(beatmapSetChange);
+                ensurePlayingSelected(preview);
             }, 100);
         }
 
@@ -346,6 +344,7 @@ namespace osu.Game.Screens.Select
             if (track != null)
             {
                 trackManager.SetExclusive(track);
+                System.Diagnostics.Debug.WriteLine("Preview: {0}", preview);
                 if (preview)
                     track.Seek(Beatmap.Metadata.PreviewTime);
                 track.Start();

From 3b3cc59471bfa83ea8968afbb9c014b849bf12b0 Mon Sep 17 00:00:00 2001
From: MrTheMake <marc.stephan96@hotmail.de>
Date: Sun, 18 Jun 2017 20:21:24 +0200
Subject: [PATCH 2/3] Fix NullReferenceException

---
 osu.Game/Screens/Select/SongSelect.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 2ff0635be0..b5d50664fc 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -321,7 +321,7 @@ namespace osu.Game.Screens.Select
             if (beatmap.Equals(Beatmap?.BeatmapInfo))
                 return;
 
-            bool preview = beatmap.BeatmapSetInfoID != Beatmap.BeatmapInfo.BeatmapSetInfoID;
+            bool preview = beatmap.BeatmapSetInfoID != Beatmap?.BeatmapInfo.BeatmapSetInfoID;
 
             if (beatmap.BeatmapSetInfoID == selectionChangeNoBounce?.BeatmapSetInfoID)
                 sampleChangeDifficulty.Play();

From a399b188379876b10f97f145a6314b5bb24dade5 Mon Sep 17 00:00:00 2001
From: MrTheMake <marc.stephan96@hotmail.de>
Date: Mon, 19 Jun 2017 00:11:47 +0200
Subject: [PATCH 3/3] Removed debug line

---
 osu.Game/Screens/Select/SongSelect.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index b5d50664fc..801eb72ba5 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -344,7 +344,6 @@ namespace osu.Game.Screens.Select
             if (track != null)
             {
                 trackManager.SetExclusive(track);
-                System.Diagnostics.Debug.WriteLine("Preview: {0}", preview);
                 if (preview)
                     track.Seek(Beatmap.Metadata.PreviewTime);
                 track.Start();