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

Fix seeking back to beginning too early

Browse Source
This commit is contained in:
voidedWarranties 2020-03-23 22:37:53 -07:00
parent a38c912c6d
commit b41f3f1cad
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
View File

@ -130,7 +130,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (!track.IsLoaded) if (!track.IsLoaded)
return; return;
adjustableClock.Seek(Current / Content.DrawWidth * track.Length); double target = Current / Content.DrawWidth * track.Length;
adjustableClock.Seek(Math.Min(track.Length, target));
} }
private void scrollToTrackTime() private void scrollToTrackTime()

21
osu.Game/Screens/Edit/EditorClock.cs
View File

@ -43,18 +43,21 @@ namespace osu.Game.Screens.Edit
{ {
base.ProcessFrame(); base.ProcessFrame();
var playbackAlreadyStopped = playbackFinished; if (IsRunning)
playbackFinished = CurrentTime >= TrackLength;
if (playbackFinished && IsRunning)
{ {
if (!playbackAlreadyStopped) var playbackAlreadyStopped = playbackFinished;
playbackFinished = CurrentTime >= TrackLength;
if (playbackFinished)
{ {
Stop(); if (!playbackAlreadyStopped)
Seek(TrackLength); {
Stop();
Seek(TrackLength);
}
else
Seek(0);
} }
else
Seek(0);
} }
} }