From 56397dbea657759588b762734b39f3bf5ca78a57 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 24 Feb 2019 12:08:27 +0900
Subject: [PATCH] Ensure beatmap is not disabled before continuing with present

---
 osu.Game/OsuGame.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 9f6adc373c..7170dc1685 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -248,6 +248,14 @@ namespace osu.Game
                     // navigate to song select if we are not already there.
 
                     menuScreen.MakeCurrent();
+
+                    if (Beatmap.Disabled)
+                    {
+                        // we may need to wait for a lease to be returned.
+                        Schedule(() => PresentBeatmap(beatmap));
+                        return;
+                    }
+
                     menuScreen.LoadToSolo();
                     break;
             }