From 4b8188065504cf88de4c8cb487a180f1a0696904 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 5 Oct 2020 14:04:04 +0900
Subject: [PATCH] Account for potentially longer non-last objects

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index e3f07dbad4..8886188d95 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -226,9 +226,11 @@ namespace osu.Game.Tests.Visual
             public ClockBackedTestWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard, IFrameBasedClock referenceClock, AudioManager audio)
                 : base(beatmap, storyboard, audio)
             {
-                var lastHitObject = beatmap.HitObjects.LastOrDefault();
+                double trackLength = 60000;
 
-                double trackLength = lastHitObject?.GetEndTime() + 2000 ?? 60000;
+                if (beatmap.HitObjects.Count > 0)
+                    // add buffer after last hitobject to allow for final replay frames etc.
+                    trackLength = beatmap.HitObjects.Max(h => h.GetEndTime()) + 2000;
 
                 if (referenceClock != null)
                 {