Merge pull request #568 from PeraSite/perasite/fix-diagnostics-dispose

Fix diagnostic windows are not updating realtime
hadashiA · Dec 22, 2023 · 123d718 · 123d718 · vercel · Dec 22, 2023
2 parents c5eb818 + 78d6e78
commit 123d718
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/VContainer/Assets/VContainer/Editor/Diagnostics/VContainerDiagnosticsWindow.cs b/VContainer/Assets/VContainer/Editor/Diagnostics/VContainerDiagnosticsWindow.cs
@@ -66,6 +66,12 @@ public void Reload(IObjectResolver resolver)
             Repaint();
         }
 
+        void OnPlayModeStateChange(PlayModeStateChange state)
+        {
+            treeView.ReloadAndSort();
+            Repaint();
+        }
+
         void OnEnable()
         {
             window = this; // set singleton.
@@ -76,11 +82,13 @@ void OnEnable()
             searchField = new SearchField();
 
             DiagnositcsContext.OnContainerBuilt += Reload;
+            EditorApplication.playModeStateChanged += OnPlayModeStateChange;
         }
 
         void OnDisable()
         {
             DiagnositcsContext.OnContainerBuilt -= Reload;
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChange;
         }
 
         void OnGUI()
@@ -205,4 +213,4 @@ void RenderStackTracePanel()
             }
         }
    }
-}
+}
diff --git a/VContainer/Assets/VContainer/Runtime/Container.cs b/VContainer/Assets/VContainer/Runtime/Container.cs
@@ -110,6 +110,10 @@ public bool TryGetRegistration(Type type, out Registration registration)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Dispose()
         {
+            if (Diagnostics != null)
+            {
+                Diagnostics.Clear();
+            }
             disposables.Dispose();
             sharedInstances.Clear();
         }
@@ -223,6 +227,10 @@ public void Inject(object instance)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void Dispose()
         {
+            if (Diagnostics != null)
+            {
+                Diagnostics.Clear();
+            }
             rootScope.Dispose();
             disposables.Dispose();
             sharedInstances.Clear();