h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 08:02:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #20483 from peppy/music-controller-thread-safety

Browse Source 
Move `MusicController` binds to `LoadComplete` for added thread safety
This commit is contained in:
Dan Balasescu 2022-09-26 17:59:02 +09:00 committed by GitHub
commit 987294f294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Overlays/MusicController.cs
View File

@ -58,12 +58,11 @@ namespace osu.Game.Overlays
[Resolved] [Resolved]
private RealmAccess realm { get; set; } private RealmAccess realm { get; set; }
[BackgroundDependencyLoader] protected override void LoadComplete()
private void load()
{ {
// Todo: These binds really shouldn't be here, but are unlikely to cause any issues for now. base.LoadComplete();
// They are placed here for now since some tests rely on setting the beatmap _and_ their hierarchies inside their load(), which runs before the MusicController's load().
beatmap.BindValueChanged(beatmapChanged, true); beatmap.BindValueChanged(b => changeBeatmap(b.NewValue), true);
mods.BindValueChanged(_ => ResetTrackAdjustments(), true); mods.BindValueChanged(_ => ResetTrackAdjustments(), true);
} }
@ -263,8 +262,6 @@ namespace osu.Game.Overlays
private IQueryable<BeatmapSetInfo> getBeatmapSets() => realm.Realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending); private IQueryable<BeatmapSetInfo> getBeatmapSets() => realm.Realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending);
private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap) => changeBeatmap(beatmap.NewValue);
private void changeBeatmap(WorkingBeatmap newWorking) private void changeBeatmap(WorkingBeatmap newWorking)
{ {
// This method can potentially be triggered multiple times as it is eagerly fired in next() / prev() to ensure correct execution order // This method can potentially be triggered multiple times as it is eagerly fired in next() / prev() to ensure correct execution order