From 437cc834ebc8586c02d70e8dbff90448e55e7d6a Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 2 Feb 2017 12:21:34 -0500
Subject: [PATCH] @Tom94 pointed out this problem

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

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 3255491ea7..1fa6d9d3a6 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Select
 
         private void start()
         {
-            if (player != null)
+            if (player != null || Beatmap == null)
                 return;
 
             //in the future we may want to move this logic to a PlayerLoader gamemode or similar, so we can rely on the SongSelect transition