RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-07 13:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8856 from peppy/fix-editor-hard-crash

Browse Source 
Fix editor crashing when entering with no beatmap selected
This commit is contained in:
Dan Balasescu 2020-04-24 12:53:59 +09:00 committed by GitHub
commit 2a1335a21e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,9 +60,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
waveform.Waveform = b.NewValue.Waveform; waveform.Waveform = b.NewValue.Waveform;
track = b.NewValue.Track; track = b.NewValue.Track;
MaxZoom = getZoomLevelForVisibleMilliseconds(500); if (track.Length > 0)
MinZoom = getZoomLevelForVisibleMilliseconds(10000); {
Zoom = getZoomLevelForVisibleMilliseconds(2000); MaxZoom = getZoomLevelForVisibleMilliseconds(500);
MinZoom = getZoomLevelForVisibleMilliseconds(10000);
Zoom = getZoomLevelForVisibleMilliseconds(2000);
}
}, true); }, true);
} }
@ -135,7 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private void scrollToTrackTime() private void scrollToTrackTime()
{ {
if (!track.IsLoaded) if (!track.IsLoaded || track.Length == 0)
return; return;
ScrollTo((float)(adjustableClock.CurrentTime / track.Length) * Content.DrawWidth, false); ScrollTo((float)(adjustableClock.CurrentTime / track.Length) * Content.DrawWidth, false);