From 6e821a426d4bcc234788a7703110ed9fc7ad5185 Mon Sep 17 00:00:00 2001
From: Jamie Taylor <me@nekodex.net>
Date: Thu, 28 Feb 2019 15:01:32 +0900
Subject: [PATCH] Fix restoration of enabled mods when cancelling song select

---
 osu.Game/Screens/Select/MatchSongSelect.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index bdff35e345..ec4a39206b 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -9,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Multi;
 
 namespace osu.Game.Screens.Select
@@ -23,6 +25,9 @@ namespace osu.Game.Screens.Select
         [Resolved(typeof(Room))]
         protected Bindable<PlaylistItem> CurrentItem { get; private set; }
 
+        [Resolved]
+        protected Bindable<IEnumerable<Mod>> CurrentMods { get; private set; }
+
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
@@ -56,9 +61,8 @@ namespace osu.Game.Screens.Select
                 return true;
 
             Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value?.Beatmap);
+            Beatmap.Value.Mods.Value = CurrentMods.Value = CurrentItem.Value?.RequiredMods;
             Ruleset.Value = CurrentItem.Value?.Ruleset;
-            CurrentItem.Value?.RequiredMods.Clear();
-            CurrentItem.Value?.RequiredMods.AddRange(SelectedMods.Value);
 
             Beatmap.Disabled = true;
             Ruleset.Disabled = true;