Fix various asset windows shutdown when editor is disposing during crash

2025-01-24 22:55:21 +01:00
parent 0b48a274e5
commit d4c72487cd
15 changed files with 54 additions and 28 deletions
--- a/Source/Editor/Windows/Assets/JsonAssetWindow.cs
+++ b/Source/Editor/Windows/Assets/JsonAssetWindow.cs
@@ -320,14 +320,16 @@ namespace FlaxEditor.Windows.Assets
        /// <inheritdoc />
        public override void OnDestroy()
        {
+            if (IsDisposing)
+                return;
+            base.OnDestroy();
+
            if (_isRegisteredForScriptsReload)
            {
                _isRegisteredForScriptsReload = false;
                ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
            }
            _typeText = null;
-
-            base.OnDestroy();
        }
    }
 }