From ad3dd1c700e09b30a64d90e00903ae3dc24f7923 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 25 Aug 2022 14:45:00 +0900
Subject: [PATCH] Fix a couple of oversights regarding `track` nullability

---
 osu.Game/Beatmaps/WorkingBeatmap.cs    |  1 +
 osu.Game/Screens/Play/FailAnimation.cs | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 301610ee58..eb914e61d4 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -146,6 +146,7 @@ namespace osu.Game.Beatmaps
         /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
         /// This generally happens via MusicController when changing the global beatmap.
         /// </summary>
+        [NotNull]
         public Track Track
         {
             get
diff --git a/osu.Game/Screens/Play/FailAnimation.cs b/osu.Game/Screens/Play/FailAnimation.cs
index 4d3b08cbe0..965d3d3454 100644
--- a/osu.Game/Screens/Play/FailAnimation.cs
+++ b/osu.Game/Screens/Play/FailAnimation.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play
 
         private Box redFlashLayer = null!;
 
-        private Track? track;
+        private Track track = null!;
 
         private AudioFilter failLowPassFilter = null!;
         private AudioFilter failHighPassFilter = null!;
@@ -153,15 +153,17 @@ namespace osu.Game.Screens.Play
 
         public void RemoveFilters(bool resetTrackFrequency = true)
         {
-            if (filtersRemoved)
-                return;
+            if (filtersRemoved) return;
 
             filtersRemoved = true;
 
-            if (resetTrackFrequency)
-                track?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
+            if (!started)
+                return;
 
-            track?.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
+            if (resetTrackFrequency)
+                track.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
+
+            track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
 
             if (filters.Parent == null)
                 return;