Merge branch 'master' into master

osu.Game/OsuGame.cs

@@ -282,11 +282,9 @@ namespace osu.Game
 
             performFromMainMenu(() =>
             {
-                Ruleset.Value = databasedScoreInfo.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
-                Mods.Value = databasedScoreInfo.Mods;
 
-                menuScreen.Push(new PlayerLoader(() => new ReplayPlayer(databasedScore)));
+                menuScreen.Push(new ReplayPlayerLoader(databasedScore));
             }, $"watch {databasedScoreInfo}", bypassScreenAllowChecks: true);
         }
 

osu.Game/Screens/Play/ReplayPlayerLoader.cs

@@ -0,0 +1,34 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Game.Scoring;
+
+namespace osu.Game.Screens.Play
+{
+    public class ReplayPlayerLoader : PlayerLoader
+    {
+        private readonly ScoreInfo scoreInfo;
+
+        public ReplayPlayerLoader(Score score)
+            : base(() => new ReplayPlayer(score))
+        {
+            if (score.Replay == null)
+                throw new ArgumentNullException(nameof(score.Replay), $"{nameof(score)} must have a non-null {nameof(score.Replay)}.");
+
+            scoreInfo = score.ScoreInfo;
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = base.CreateChildDependencies(parent);
+
+            // these will be reverted thanks to PlayerLoader's lease.
+            Mods.Value = scoreInfo.Mods;
+            Ruleset.Value = scoreInfo.Ruleset;
+
+            return dependencies;
+        }
+    }
+}