From b1d4261402088dd44aee59130863d15be2f90add Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 25 Mar 2020 15:45:33 +0900
Subject: [PATCH] Fix track looping state not being reset when entering editor
 from song select

Closes #8432.
---
 osu.Game/Screens/Select/PlaySongSelect.cs | 2 --
 osu.Game/Screens/Select/SongSelect.cs     | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 8b0547376d..179aab54a3 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -85,8 +85,6 @@ namespace osu.Game.Screens.Select
                 }
             }
 
-            Beatmap.Value.Track.Looping = false;
-
             SampleConfirm?.Play();
 
             this.Push(player = new PlayerLoader(() => new Player()));
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index b6ec40ab88..895a8ad0c9 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -572,6 +572,9 @@ namespace osu.Game.Screens.Select
 
             BeatmapOptions.Hide();
 
+            if (Beatmap.Value.Track != null)
+                Beatmap.Value.Track.Looping = false;
+
             this.ScaleTo(1.1f, 250, Easing.InSine);
 
             this.FadeOut(250);