Merge branch 'master' into ios-editor-crash-fix

This commit is contained in:
Dan Balasescu
2020-11-04 15:56:40 +09:00
committed by GitHub
2 changed files with 13 additions and 0 deletions

View File

@ -174,6 +174,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (!track.IsLoaded || track.Length == 0)
return;
// covers the case where the user starts playback after a drag is in progress.
// we want to ensure the clock is always stopped during drags to avoid weird audio playback.
if (handlingDragInput)
editorClock.Stop();
ScrollTo((float)(editorClock.CurrentTime / track.Length) * Content.DrawWidth, false);
}