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

Merge pull request #667 from ColdVolcano/music-controller-fixes

Browse Source 
Fix MusicController not being able to change song
This commit is contained in:
Dean Herbert 2017-04-24 00:05:22 +09:00 committed by GitHub
commit 8ee7968dc9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Beatmaps
public readonly BeatmapSetInfo BeatmapSetInfo; public readonly BeatmapSetInfo BeatmapSetInfo;
public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>(); public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>(new Mod[] { });
public readonly bool WithStoryboard; public readonly bool WithStoryboard;

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

@ -22,6 +22,7 @@ using osu.Game.Database;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Primitives;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Framework.Extensions;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
namespace osu.Game.Overlays namespace osu.Game.Overlays
@ -293,7 +294,7 @@ namespace osu.Game.Overlays
trackManager.SetExclusive(current.Track); trackManager.SetExclusive(current.Track);
current.Track.Start(); current.Track.Start();
beatmapSource.Value = current; beatmapSource.Value = current;
}); }).ContinueWith(task => Schedule(() => task.ThrowIfFaulted()), TaskContinuationOptions.OnlyOnFaulted);
updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev); updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
} }