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

Fix intro setting beatmap in background thread causing race conditions

Browse Source
This commit is contained in:
Dean Herbert 2018-04-22 02:42:48 +09:00
parent 295e1c78ee
commit 2c9b2aa0e7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Menu/Intro.cs
View File

@ -39,6 +39,7 @@ namespace osu.Game.Screens.Menu
private Bindable<bool> menuVoice; private Bindable<bool> menuVoice;
private Bindable<bool> menuMusic; private Bindable<bool> menuMusic;
private Track track; private Track track;
private WorkingBeatmap beatmap;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game) private void load(AudioManager audio, OsuConfigManager config, BeatmapManager beatmaps, Framework.Game game)
@ -69,8 +70,7 @@ namespace osu.Game.Screens.Menu
} }
} }
Beatmap.Value = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]); beatmap = beatmaps.GetWorkingBeatmap(setInfo.Beatmaps[0]);
track = Beatmap.Value.Track; track = Beatmap.Value.Track;
welcome = audio.Sample.Get(@"welcome"); welcome = audio.Sample.Get(@"welcome");
@ -81,6 +81,8 @@ namespace osu.Game.Screens.Menu
{ {
base.OnEntering(last); base.OnEntering(last);
Game.Beatmap.Value = beatmap;
if (menuVoice) if (menuVoice)
welcome.Play(); welcome.Play();