From f63c66396f7a2f1f462377ae4a3b6c4c9e4dce40 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 2 Jun 2020 13:32:52 +0200
Subject: [PATCH] Apply review suggestions.

---
 .../Visual/Gameplay/TestSceneReplay.cs        |  2 +-
 osu.Game/Rulesets/Ruleset.cs                  |  2 ++
 osu.Game/Screens/Select/PlaySongSelect.cs     | 25 +++++++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index 1908988739..3a71d4ca54 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var beatmap = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, Array.Empty<Mod>());
 
-            return new ScoreAccessibleReplayPlayer(ruleset.GetAutoplayMod().CreateReplayScore(beatmap));
+            return new ScoreAccessibleReplayPlayer(ruleset.GetAutoplayMod()?.CreateReplayScore(beatmap));
         }
 
         protected override void AddCheckSteps()
diff --git a/osu.Game/Rulesets/Ruleset.cs b/osu.Game/Rulesets/Ruleset.cs
index 8f41e421a3..4f28607733 100644
--- a/osu.Game/Rulesets/Ruleset.cs
+++ b/osu.Game/Rulesets/Ruleset.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Skinning;
 using osu.Game.Users;
+using JetBrains.Annotations;
 
 namespace osu.Game.Rulesets
 {
@@ -100,6 +101,7 @@ namespace osu.Game.Rulesets
             return value;
         }
 
+        [CanBeNull]
         public ModAutoplay GetAutoplayMod() => GetAllMods().OfType<ModAutoplay>().FirstOrDefault();
 
         public virtual ISkin CreateLegacySkinProvider(ISkinSource source, IBeatmap beatmap) => null;
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 71ab3715e0..a0201e696f 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -7,6 +7,8 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
@@ -20,6 +22,9 @@ namespace osu.Game.Screens.Select
         private bool removeAutoModOnResume;
         private OsuScreen player;
 
+        [Resolved]
+        private NotificationOverlay notifications { get; set; }
+
         public override bool AllowExternalScreenChange => true;
 
         protected override UserActivity InitialActivity => new UserActivity.ChoosingBeatmap();
@@ -83,15 +88,21 @@ namespace osu.Game.Screens.Select
                 var auto = Ruleset.Value.CreateInstance().GetAutoplayMod();
                 var autoType = auto?.GetType();
 
-                if (autoType != null)
-                {
-                    var mods = Mods.Value;
+                var mods = Mods.Value;
 
-                    if (mods.All(m => m.GetType() != autoType))
+                if (autoType == null)
+                {
+                    notifications.Post(new SimpleNotification
                     {
-                        Mods.Value = mods.Append(auto).ToArray();
-                        removeAutoModOnResume = true;
-                    }
+                        Text = "The current ruleset doesn't have an autoplay mod avalaible!"
+                    });
+                    return false;
+                }
+
+                if (mods.All(m => m.GetType() != autoType))
+                {
+                    Mods.Value = mods.Append(auto).ToArray();
+                    removeAutoModOnResume = true;
                 }
             }