Remove Enable() / Disable() overrides

realitycollective · Jun 3, 2024 · a710020 · a710020
1 parent 5114355
commit a710020
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 36 deletions.
diff --git a/Runtime/ConsoleDiagnostics/ConsoleDiagnosticsServiceModule.cs b/Runtime/ConsoleDiagnostics/ConsoleDiagnosticsServiceModule.cs
@@ -23,21 +23,17 @@ public ConsoleDiagnosticsServiceModule(string name, uint priority, BaseProfile p
         }
 
         /// <inheritdoc />
-        public override void Enable()
+        public override void Start()
         {
-            base.Enable();
-
             if (DiagnosticsService != null)
             {
                 Application.logMessageReceived += DiagnosticsService.RaiseLogReceived;
             }
         }
 
         /// <inheritdoc />
-        public override void Disable()
+        public override void Destroy()
         {
-            base.Disable();
-
             if (DiagnosticsService != null)
             {
                 Application.logMessageReceived -= DiagnosticsService.RaiseLogReceived;

diff --git a/Runtime/DiagnosticsService.cs b/Runtime/DiagnosticsService.cs
@@ -71,17 +71,6 @@ public override void Initialize()
             frameEventData = new FrameEventData(currentEventSystem);
             consoleEventData = new ConsoleEventData(currentEventSystem);
             memoryEventData = new MemoryEventData(currentEventSystem);
-        }
-
-        /// <inheritdoc />
-        public override void Enable()
-        {
-            base.Enable();
-
-            if (!Application.isPlaying)
-            {
-                return;
-            }
 
             if (profile.ShowDiagnosticsWindowOnStart == AutoStartBehavior.AutoStart)
             {
@@ -90,24 +79,13 @@ public override void Enable()
         }
 
         /// <inheritdoc />
-        public override void Disable()
+        public override void Destroy()
         {
-            base.Disable();
-
-            if (!Application.isPlaying) { return; }
-
-            if (diagnosticsWindow != null)
+            if (diagnosticsWindow.IsNotNull())
             {
                 Unregister(diagnosticsWindow);
             }
 
-        }
-
-        /// <inheritdoc />
-        public override void Destroy()
-        {
-            base.Destroy();
-
             diagnosticsWindow.Destroy();
 
             if (!diagnosticsRoot.IsNull() &&
@@ -166,7 +144,10 @@ public bool IsWindowEnabled
             get => DiagnosticsWindow.activeInHierarchy && isWindowEnabled;
             set
             {
-                if (isWindowEnabled == value) { return; }
+                if (isWindowEnabled == value)
+                {
+                    return;
+                }
 
                 isWindowEnabled = value;
                 DiagnosticsWindow.SetActive(isWindowEnabled);

diff --git a/Runtime/FrameDiagnostics/FrameDiagnosticsServiceModule.cs b/Runtime/FrameDiagnostics/FrameDiagnosticsServiceModule.cs
@@ -74,12 +74,8 @@ private int DeviceTargetRefreshRate
         #region IService Implementation
 
         /// <inheritdoc />
-        public override void Enable()
+        public override void Start()
         {
-            base.Enable();
-
-            if (!Application.isPlaying) { return; }
-
             stopwatch.Restart();
         }