Merge branch 'master' into fix-beatmap-null

This commit is contained in:
Dean Herbert
2017-07-20 09:33:14 +09:00
committed by GitHub

View File

@ -121,7 +121,9 @@ namespace osu.Game.Screens.Menu
Scheduler.AddDelayed(delegate
{
track.Start();
// Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Manu.
if (menuMusic)
track.Start();
LoadComponentAsync(mainMenu = new MainMenu());