Merge branch 'frame-stable-cache' into skin/argon-song-progress-cleaner

ppy · Jan 18, 2023 · 4cfb059 · 4cfb059
2 parents 67b40dd + 0470550
commit 4cfb059
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
@@ -225,7 +225,6 @@ private void load(AudioManager audio, OsuConfigManager config, OsuGameBase game,
 
             DrawableRuleset = ruleset.CreateDrawableRulesetWith(playableBeatmap, gameplayMods);
             dependencies.CacheAs(DrawableRuleset);
-            dependencies.CacheAs(DrawableRuleset.FrameStableClock);
 
             ScoreProcessor = ruleset.CreateScoreProcessor();
             ScoreProcessor.Mods.Value = gameplayMods;
@@ -310,6 +309,8 @@ private void load(AudioManager audio, OsuConfigManager config, OsuGameBase game,
                 });
             }
 
+            dependencies.CacheAs(DrawableRuleset.FrameStableClock);
+
             // add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components.
             // also give the overlays the ruleset skin provider to allow rulesets to potentially override HUD elements (used to disable combo counters etc.)
             // we may want to limit this in the future to disallow rulesets from outright replacing elements the user expects to be there.