From ef775458ddeaf8da5d67f4df63a3029d17d282f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 17 Feb 2017 21:27:17 +0100 Subject: [PATCH] Fix compilation error introduced in merge conflict resolution. --- osu.Game/Beatmaps/Beatmap.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Beatmaps/Beatmap.cs b/osu.Game/Beatmaps/Beatmap.cs index c251943fa7..f9bc865860 100644 --- a/osu.Game/Beatmaps/Beatmap.cs +++ b/osu.Game/Beatmaps/Beatmap.cs @@ -39,6 +39,7 @@ namespace osu.Game.Beatmaps ControlPoint timingPoint = null; foreach (var controlPoint in ControlPoints) + { // Some beatmaps have the first timingPoint (accidentally) start after the first HitObject(s). // This null check makes it so that the first ControlPoint that makes a timing change is used as // the timingPoint for those HitObject(s).