Merge branch 'master' into always-load-storyboard

This commit is contained in:
Thomas Müller
2017-07-20 20:54:16 +02:00
committed by GitHub
10 changed files with 140 additions and 71 deletions

View File

@ -115,10 +115,7 @@ namespace osu.Game.Screens.Play
Track track = Beatmap.Value.Track;
if (track != null)
{
audio.Track.SetExclusive(track);
adjustableSourceClock = track;
}
adjustableSourceClock = (IAdjustableClock)track ?? new StopwatchClock();