h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-22 23:40:45 +08:00
Code Issues 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
Unverified
parent 92182ad706 e67ac515fc
commit 2a1335a21e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+7 -4
View File
@@ -60,9 +60,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
waveform.Waveform = b.NewValue.Waveform;
track = b.NewValue.Track;
MaxZoom = getZoomLevelForVisibleMilliseconds(500);
MinZoom = getZoomLevelForVisibleMilliseconds(10000);
Zoom = getZoomLevelForVisibleMilliseconds(2000);
if (track.Length > 0)
{
MaxZoom = getZoomLevelForVisibleMilliseconds(500);
MinZoom = getZoomLevelForVisibleMilliseconds(10000);
Zoom = getZoomLevelForVisibleMilliseconds(2000);
}
}, true);
}
@@ -135,7 +138,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private void scrollToTrackTime()
{
if (!track.IsLoaded)
if (!track.IsLoaded || track.Length == 0)
return;
ScrollTo((float)(adjustableClock.CurrentTime / track.Length) * Content.DrawWidth, false);