Fix errors from song loading being cancelled by an error/the rescan w…

…arning
JayDiddyThaGOAT · Mar 21, 2024 · 89a9d86 · 89a9d86
1 parent 506e1cf
commit 89a9d86
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Assets/Script/Gameplay/GameManager.cs b/Assets/Script/Gameplay/GameManager.cs
@@ -162,8 +162,8 @@ private void OnDestroy()
                 Navigator.Instance.NavigationEvent -= OnNavigationEvent;
             }
             GlobalVariables.AudioManager.SongEnd -= OnAudioEnd;
-            _songRunner.Dispose();
-            BeatEventHandler.Unsubscribe(StarPowerClap);
+            _songRunner?.Dispose();
+            BeatEventHandler?.Unsubscribe(StarPowerClap);
             BackgroundManager.Dispose();
 
             // Reset the time scale back, as it would be 0 at this point (because of pausing)

diff --git a/Assets/Script/Gameplay/GameplayBehaviour.cs b/Assets/Script/Gameplay/GameplayBehaviour.cs
@@ -45,9 +45,10 @@ protected void Awake()
         // Protected to warn when hidden by an inheriting class
         protected void OnDestroy()
         {
-            GameplayDestroy();
+            if (GameManager == null)
+                return;
 
-            if (GameManager == null) return;
+            GameplayDestroy();
 
             GameManager.ChartLoaded -= _OnChartLoaded;
             GameManager.SongLoaded -= _OnSongLoaded;

diff --git a/Assets/Script/Integration/StageKit/StageKitGameplay.cs b/Assets/Script/Integration/StageKit/StageKitGameplay.cs
@@ -307,6 +307,9 @@ private void HandleVenue(LightingType lightingEvent)
 
         protected override void GameplayDestroy()
         {
+            if (_controller == null)
+                return;
+
             _controller.AllLedsOff();
             KillCue();
             _controller.StageKits.ForEach(kit => kit.ResetHaptics());