sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into excess-skin-change

Browse Source
This commit is contained in:
Dan Balasescu
2019-02-27 20:30:18 +09:00
committed by GitHub
parent f942515fcd 374750eef1
commit d2c2e41e0c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Audio/PreviewTrack.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Audio
private void load() private void load()
{ {
track = GetTrack(); track = GetTrack();
track.Completed += Stop; track.Completed += () => Schedule(Stop);
} }
/// <summary> /// <summary>

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

@ -351,11 +351,11 @@ namespace osu.Game.Overlays
queuedDirection = null; queuedDirection = null;
} }
private void currentTrackCompleted() private void currentTrackCompleted() => Schedule(() =>
{ {
if (!beatmap.Disabled && beatmapSets.Any()) if (!current.Track.Looping && !beatmap.Disabled && beatmapSets.Any())
next(); next();
} });
private ScheduledDelegate pendingBeatmapSwitch; private ScheduledDelegate pendingBeatmapSwitch;