From 5e78f51e24888f73787d10d63da0cbf7b33b8f67 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 30 Jan 2019 23:56:03 +0900
Subject: [PATCH] Fix multiplayer crashing when exiting from lounge

---
 osu.Game/Screens/Multi/Multiplayer.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 44beed1787..816ba2c273 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -193,7 +193,10 @@ namespace osu.Game.Screens.Multi
             this.Delay(WaveContainer.DISAPPEAR_DURATION).FadeOut();
 
             cancelLooping();
-            loungeSubScreen.MakeCurrent();
+
+            if (screenStack.CurrentScreen != null)
+                loungeSubScreen.MakeCurrent();
+
             updatePollingRate(isIdle.Value);
 
             // the wave overlay transition takes longer than expected to run.