sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-18 08:49:54 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix beatmap import crash when the first timingPoint starts later than a slider

Browse Source
This commit is contained in:
Shadoxfix
2017-02-17 17:36:00 +01:00
parent ecb840e26f
commit 72306e8757
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Beatmaps/Beatmap.cs
View File

@ -39,6 +39,7 @@ namespace osu.Game.Beatmaps
ControlPoint timingPoint = null; ControlPoint timingPoint = null;
foreach (var controlPoint in ControlPoints) foreach (var controlPoint in ControlPoints)
{
if (controlPoint.Time <= time) if (controlPoint.Time <= time)
{ {
if (controlPoint.TimingChange) if (controlPoint.TimingChange)
@ -48,7 +49,15 @@ namespace osu.Game.Beatmaps
} }
else overridePoint = controlPoint; else overridePoint = controlPoint;
} }
else break; else if (timingPoint == null && controlPoint.TimingChange)
{
timingPoint = controlPoint;
}
else
{
break;
}
}
return timingPoint; return timingPoint;
} }