From 7c2ffb18269cfbb1d03724c9936935d09b1791a0 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Fri, 22 Feb 2019 11:26:06 +0000
Subject: [PATCH] Fix MatchSongSelect not handling beatmapset deletions

---
 .../Screens/Multi/Match/Components/ReadyButton.cs | 10 ++++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs        | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index 3e4694e232..b299e70962 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Screens.Multi.Match.Components
         private void load()
         {
             beatmaps.ItemAdded += beatmapAdded;
+            beatmaps.ItemRemoved += beatmapRemoved;
 
             Beatmap.BindValueChanged(b => updateBeatmap(b.NewValue), true);
         }
@@ -62,6 +63,15 @@ namespace osu.Game.Screens.Multi.Match.Components
                 Schedule(() => hasBeatmap = true);
         }
 
+        private void beatmapRemoved(BeatmapSetInfo model)
+        {
+            if (Beatmap.Value == null)
+                return;
+
+            if (model.OnlineBeatmapSetID == Beatmap.Value.BeatmapSet.OnlineBeatmapSetID)
+                Schedule(() => hasBeatmap = false);
+        }
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index cfeaa1785e..f54add6a36 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -3,8 +3,11 @@
 
 using System;
 using Humanizer;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
+using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi;
 
@@ -17,6 +20,12 @@ namespace osu.Game.Screens.Select
         public string ShortTitle => "song selection";
         public override string Title => ShortTitle.Humanize();
 
+        [Resolved(typeof(Room))]
+        protected Bindable<PlaylistItem> CurrentItem { get; private set; }
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
         public MatchSongSelect()
         {
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
@@ -43,10 +52,14 @@ namespace osu.Game.Screens.Select
 
         public override bool OnExiting(IScreen next)
         {
+            if (base.OnExiting(next))
+                return true;
+
+            Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value?.Beatmap);
             Beatmap.Disabled = true;
             Ruleset.Disabled = true;
 
-            return base.OnExiting(next);
+            return false;
         }
 
         public override void OnEntering(IScreen last)