Fix indicator not showing and errors after restarting a play

AccuracyIndicator/Patch/SceneChangePatch.cs

@@ -1,5 +1,6 @@
 using AccuracyIndicator.Indicator;
 using HarmonyLib;
+using MelonLoader;
 using UnityEngine;
 
 namespace AccuracyIndicator.Patch;
@@ -8,46 +9,49 @@ public static class SceneChangePatch
 {
     public static void OnSceneWasUnloaded(string sceneName)
     {
-        switch (sceneName)
-        {
-            case "GameMain":
-                if (Main.IndicatorObj != null)
-                {
-                    Object.Destroy(Main.IndicatorObj);
-                    Main.IndicatorObj = null;
-                }
-
-                break;
-        }
+        if (sceneName == "GameMain")
+            Destroy();
     }
-    
+
     [HarmonyPatch(typeof(PnlVictory), "OnVictory")]
     internal static class VictoryPatch
     {
-
         private static void Postfix()
         {
             var meanDelay = Main.InGameIndicator.GetMeanDelay();
             var report = Main.InGameIndicator.GetReport();
 
             Object.Destroy(Main.InGameIndicator);
+            Main.InGameIndicator = null;
 
             var victoryIndicator = Main.IndicatorObj.AddComponent<VictoryIndicator>();
-            
+
             victoryIndicator.SetMeanDelay(meanDelay);
             victoryIndicator.SetReport(report);
         }
     }
-        
+
     [HarmonyPatch(typeof(PnlFail), "Fail")]
     internal static class FailPatch
     {
-
         private static void Postfix()
+        {
+            Destroy();
+        }
+    }
+
+    private static void Destroy()
+    {
+        if (Main.InGameIndicator is not null)
+        {
+            Object.Destroy(Main.InGameIndicator);
+            Main.InGameIndicator = null;
+        }
+
+        if (Main.IndicatorObj is not null)
         {
             Object.Destroy(Main.IndicatorObj);
             Main.IndicatorObj = null;
         }
     }
-
 }