From b95042e370bcb946cf75ec2eb5e6c4e4ec438e0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 20 Jun 2018 12:43:48 +0900
Subject: [PATCH 1/3] Fix background screens not supporting early-exit
 condition

Closes #2681.
---
 osu.Game/Screens/BackgroundScreen.cs | 11 +++++++++--
 osu.Game/Screens/OsuScreen.cs        |  9 ++++-----
 osu.Game/osu.Game.csproj             |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index 5e9863f642..61277439c1 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -37,10 +37,17 @@ namespace osu.Game.Screens
             }
 
             // Make sure the in-progress loading is complete before pushing the screen.
-            while (screen.LoadState < LoadState.Ready)
+            while (screen.LoadState != LoadState.Ready)
                 Thread.Sleep(1);
 
-            base.Push(screen);
+            try
+            {
+                base.Push(screen);
+            }
+            catch (InvalidOperationException)
+            {
+                // screen may have exited before the push was successful.
+            }
         }
 
         protected override void Update()
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 61018f9e08..865b4c9070 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -195,11 +195,10 @@ namespace osu.Game.Screens
 
             if (Background != null && !Background.Equals(nextOsu?.Background))
             {
-                if (nextOsu != null)
-                    //We need to use MakeCurrent in case we are jumping up multiple game screens.
-                    nextOsu.Background?.MakeCurrent();
-                else
-                    Background.Exit();
+                Background.Exit();
+
+                //We need to use MakeCurrent in case we are jumping up multiple game screens.
+                nextOsu?.Background?.MakeCurrent();
             }
 
             if (base.OnExiting(next))
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index f0bc330994..21ba229543 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="ppy.osu.Framework" Version="2018.619.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="0.0.6042" />
     <PackageReference Include="SharpCompress" Version="0.18.1" />
     <PackageReference Include="NUnit" Version="3.10.1" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />

From 34fef3caba8b226859d8182d6be420acf816aef5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jun 2018 20:13:29 +0900
Subject: [PATCH 2/3] Update exception type

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

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index 61277439c1..d3192aa612 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens
             {
                 base.Push(screen);
             }
-            catch (InvalidOperationException)
+            catch (ScreenAlreadyExitedException)
             {
                 // screen may have exited before the push was successful.
             }

From 0e649b8866bc932f532060f500dc9694289aa9fc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jun 2018 20:16:24 +0900
Subject: [PATCH 3/3] Change logic

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

diff --git a/osu.Game/Screens/BackgroundScreen.cs b/osu.Game/Screens/BackgroundScreen.cs
index d3192aa612..9d9432b2ce 100644
--- a/osu.Game/Screens/BackgroundScreen.cs
+++ b/osu.Game/Screens/BackgroundScreen.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens
             }
 
             // Make sure the in-progress loading is complete before pushing the screen.
-            while (screen.LoadState != LoadState.Ready)
+            while (screen.LoadState < LoadState.Ready)
                 Thread.Sleep(1);
 
             try