From 0d36907cad09b4d45305c1f2c3e342e570872252 Mon Sep 17 00:00:00 2001
From: Nitrous <nathan.alo2000@gmail.com>
Date: Thu, 28 Jul 2022 15:30:45 +0800
Subject: [PATCH] apply code quality fixes

---
 osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs | 2 +-
 osu.Game/Screens/Play/HUD/DefaultSongProgress.cs        | 4 +++-
 osu.Game/Screens/Play/HUD/SongProgress.cs               | 6 +++---
 osu.Game/Skinning/LegacySongProgress.cs                 | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 4a786f2ebe..3f81757fcd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         [SetUpSteps]
         public void SetupSteps()
         {
-            AddStep("reset clock", () => gameplayClockContainer.Reset(false));
+            AddStep("reset clock", () => gameplayClockContainer.Reset());
             AddStep("set hit objects", setHitObjects);
         }
 
diff --git a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
index 347bd797ac..654884c0d5 100644
--- a/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/DefaultSongProgress.cs
@@ -174,7 +174,9 @@ namespace osu.Game.Screens.Play.HUD
 
         protected override void UpdateObjects(IEnumerable<HitObject> objects)
         {
-            graph.Objects = objects;
+            if (objects != null)
+                graph.Objects = objects;
+
             info.StartTime = FirstHitTime;
             info.EndTime = LastHitTime;
             bar.StartTime = FirstHitTime;
diff --git a/osu.Game/Screens/Play/HUD/SongProgress.cs b/osu.Game/Screens/Play/HUD/SongProgress.cs
index 55c85a1d91..78f0142dba 100644
--- a/osu.Game/Screens/Play/HUD/SongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgress.cs
@@ -30,8 +30,8 @@ namespace osu.Game.Screens.Play.HUD
             set
             {
                 objects = value;
-                FirstHitTime = objects.FirstOrDefault()?.StartTime ?? 0;
-                LastHitTime = objects.LastOrDefault()?.GetEndTime() ?? 0;
+                FirstHitTime = objects?.FirstOrDefault()?.StartTime ?? 0;
+                LastHitTime = objects?.LastOrDefault()?.GetEndTime() ?? 0;
                 UpdateObjects(objects);
             }
         }
@@ -42,7 +42,7 @@ namespace osu.Game.Screens.Play.HUD
         protected double LastHitTime { get; private set; }
 
         protected abstract void UpdateProgress(double progress, bool isIntro);
-        protected abstract void UpdateObjects(IEnumerable<HitObject> objects);
+        protected abstract void UpdateObjects(IEnumerable<HitObject>? objects);
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game/Skinning/LegacySongProgress.cs b/osu.Game/Skinning/LegacySongProgress.cs
index ee071ad3ed..0d1110df47 100644
--- a/osu.Game/Skinning/LegacySongProgress.cs
+++ b/osu.Game/Skinning/LegacySongProgress.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Skinning
         {
         }
 
-        protected override void UpdateObjects(IEnumerable<HitObject> objects)
+        protected override void UpdateObjects(IEnumerable<HitObject>? objects)
         {
         }