Don't list fps counter itself

ManlyMarco · Sep 14, 2019 · a62bf92 · a62bf92
1 parent a1e7076
commit a62bf92
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/FPSCounter/FPSCounter.cs b/FPSCounter/FPSCounter.cs
@@ -74,7 +74,10 @@ private void SetCapturingEnabled(bool enableCapturing, bool create)
             }
 
             if (_pluginStats.Value)
-                PluginCounter.Start(_helpers[0]);
+            {
+                // Make it start its coroutine on a helper so it gets disabled
+                PluginCounter.Start(_helpers[0], this);
+            }
 
             _helpers[0].enabled = enableCapturing;
             _helpers[1].enabled = enableCapturing;

diff --git a/FPSCounter/PluginCounter.cs b/FPSCounter/PluginCounter.cs
@@ -22,7 +22,7 @@ internal static class PluginCounter
 
         public static string StringOutput { get; private set; }
 
-        public static void Start(MonoBehaviour mb)
+        public static void Start(MonoBehaviour mb, BaseUnityPlugin thisPlugin)
         {
             if (_running) return;
             _running = true;
@@ -35,7 +35,7 @@ public static void Start(MonoBehaviour mb)
             // Hook unity event methods on all plugins
             var baseType = typeof(MonoBehaviour);
             var unityMethods = new[] { "FixedUpdate", "Update", "LateUpdate", "OnGUI" };
-            foreach (var baseUnityPlugin in Chainloader.Plugins.Where(x => x != null))
+            foreach (var baseUnityPlugin in Chainloader.Plugins.Where(x => x != null && x != thisPlugin))
             {
                 var timer = new Stopwatch();
 
@@ -83,6 +83,8 @@ public static void Stop()
             _averages.Clear();
 
             _stopAction();
+
+            StringOutput = null;
         }
 
         private static IEnumerator CollectLoop()
@@ -116,7 +118,10 @@ private static IEnumerator CollectLoop()
                     .Take(5)
                     .ToList();
 
-                StringOutput = string.Join(" | ", toShow.Select(timer => $"{timer.Key.GUID}: {timer.Value * msScale,5:0.00}ms").ToArray());
+                if (toShow.Count == 0)
+                    StringOutput = "No slow plugins";
+                else
+                    StringOutput = string.Join(" | ", toShow.Select(timer => $"{timer.Key.GUID}: {timer.Value * msScale,5:0.00}ms").ToArray());
 
                 foreach (var timer in _timers)
                     timer.Value.Value.Reset();