Merge pull request ppy#24691 from peppy/file-ipc-race-fix

Fix potential race condition in song bar beatmap lookup flow
MingxuanGame · Aug 31, 2023 · b5d8871 · b5d8871
2 parents 0131296 + cf9c812
commit b5d8871
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs b/osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs
@@ -58,9 +58,14 @@ public void TestSongBar()
 
                 songBar.Beatmap = new TournamentBeatmap(beatmap);
             });
+
             AddStep("set mods to HR", () => songBar.Mods = LegacyMods.HardRock);
             AddStep("set mods to DT", () => songBar.Mods = LegacyMods.DoubleTime);
             AddStep("unset mods", () => songBar.Mods = LegacyMods.None);
+
+            AddToggleStep("toggle expanded", expanded => songBar.Expanded = expanded);
+
+            AddStep("set null beatmap", () => songBar.Beatmap = null);
         }
     }
 }
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -92,8 +92,16 @@ private void load()
                                     else
                                     {
                                         beatmapLookupRequest = new GetBeatmapRequest(new APIBeatmap { OnlineID = beatmapId });
-                                        beatmapLookupRequest.Success += b => Beatmap.Value = new TournamentBeatmap(b);
-                                        beatmapLookupRequest.Failure += _ => Beatmap.Value = null;
+                                        beatmapLookupRequest.Success += b =>
+                                        {
+                                            if (lastBeatmapId == beatmapId)
+                                                Beatmap.Value = new TournamentBeatmap(b);
+                                        };
+                                        beatmapLookupRequest.Failure += _ =>
+                                        {
+                                            if (lastBeatmapId == beatmapId)
+                                                Beatmap.Value = null;
+                                        };
                                         API.Queue(beatmapLookupRequest);
                                     }
                                 }