sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-09 15:47:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10667 from peppy/fix-editor-play-after-drag

Browse Source 
Fix editor clock not always remaining stopped when dragging timeline
This commit is contained in:
Dan Balasescu 2020-11-04 15:24:22 +09:00 committed by GitHub
commit c4076cad4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -174,6 +174,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
if (!track.IsLoaded || track.Length == 0) if (!track.IsLoaded || track.Length == 0)
return; 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); ScrollTo((float)(editorClock.CurrentTime / track.Length) * Content.DrawWidth, false);
} }