From 48b0357e7d7daace77365a5507745d589edcda45 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 28 Oct 2020 16:11:14 +0900 Subject: [PATCH] Fix "finished playing" events handled for potentially incorrect user --- osu.Game/Screens/Play/Spectator.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/osu.Game/Screens/Play/Spectator.cs b/osu.Game/Screens/Play/Spectator.cs index 898d68a7d6..f788dcd8c7 100644 --- a/osu.Game/Screens/Play/Spectator.cs +++ b/osu.Game/Screens/Play/Spectator.cs @@ -167,6 +167,16 @@ namespace osu.Game.Screens.Play attemptStart(); } + private void userFinishedPlaying(int userId, SpectatorState state) + { + if (userId != targetUser.Id) + return; + + if (replay == null) return; + + replay.HasReceivedAllFrames = true; + } + private void attemptStart() { var resolvedRuleset = rulesets.AvailableRulesets.FirstOrDefault(r => r.ID == state.RulesetID)?.CreateInstance(); @@ -216,13 +226,6 @@ namespace osu.Game.Screens.Play api.Queue(req); } - private void userFinishedPlaying(int userId, SpectatorState state) - { - if (replay == null) return; - - replay.HasReceivedAllFrames = true; - } - protected override void Dispose(bool isDisposing) { base.Dispose(isDisposing);