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

Fix dodgy event clearing

Browse Source 
Also use local ariables where possible.
This commit is contained in:
Dean Herbert 2017-07-18 15:24:45 +09:00
parent c5d23daa6b
commit 82217be988
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,6 @@ using System.Threading.Tasks;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
@ -280,7 +279,7 @@ namespace osu.Game.Overlays
if (current != null)
{
bool audioEquals = beatmapBacking.Value?.BeatmapInfo?.AudioEquals(current.BeatmapInfo) ?? false;
bool audioEquals = beatmap?.BeatmapInfo?.AudioEquals(current.BeatmapInfo) ?? false;
if (audioEquals)
direction = TransformDirection.None;
@ -293,30 +292,28 @@ namespace osu.Game.Overlays
{
//figure out the best direction based on order in playlist.
var last = playlist.BeatmapSets.TakeWhile(b => b.ID != current.BeatmapSetInfo.ID).Count();
var next = beatmapBacking.Value == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != beatmapBacking.Value.BeatmapSetInfo.ID).Count();
var next = beatmap == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != beatmap.BeatmapSetInfo.ID).Count();
direction = last > next ? TransformDirection.Prev : TransformDirection.Next;
}
}
current = beatmapBacking.Value;
current = beatmap;
updateProgressBarLimit(current?.Track);
updateDisplay(beatmapBacking, direction);
queuedDirection = null;
}
private void updateProgressBarLimit(Track t)
{
if (t != null)
var track = current?.Track;
if (track != null)
{
t.OnLoaded += loadedTrack => progressBar.EndTime = loadedTrack.Length;
if (t.IsLoaded)
{
progressBar.EndTime = t.Length;
t.OnLoaded = null;
}
// the track may not be loaded at this point
track.OnLoaded += loadedTrack => Schedule(() => progressBar.EndTime = loadedTrack.Length);
if (track.IsLoaded)
// but it also may be.
progressBar.EndTime = track.Length;
}
updateDisplay(beatmap, direction);
queuedDirection = null;
}
private ScheduledDelegate pendingBeatmapSwitch;