From 9da9a122b8d63f35212ebc76c695d3951370638d Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 6 Feb 2024 16:59:17 +0100
Subject: [PATCH] Fix error in Editor

---
 .../Editor/CustomEditors/Editors/ModelInstanceEntryEditor.cs   | 2 +-
 Source/Editor/GUI/AssetPicker.cs                               | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/Editor/CustomEditors/Editors/ModelInstanceEntryEditor.cs b/Source/Editor/CustomEditors/Editors/ModelInstanceEntryEditor.cs
index 568a57794..f9ccf548a 100644
--- a/Source/Editor/CustomEditors/Editors/ModelInstanceEntryEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/ModelInstanceEntryEditor.cs
@@ -76,7 +76,7 @@ namespace FlaxEditor.CustomEditors.Editors
 
         private void OnSelectedMaterialChanged()
         {
-            if (_isRefreshing)
+            if (_isRefreshing || _modelInstance == null)
                 return;
             _isRefreshing = true;
             var slots = _modelInstance.MaterialSlots;
diff --git a/Source/Editor/GUI/AssetPicker.cs b/Source/Editor/GUI/AssetPicker.cs
index 84f58daf1..9e8e0485e 100644
--- a/Source/Editor/GUI/AssetPicker.cs
+++ b/Source/Editor/GUI/AssetPicker.cs
@@ -75,6 +75,9 @@ namespace FlaxEditor.GUI
         /// </summary>
         protected virtual void OnSelectedItemChanged()
         {
+            if (IsDisposing)
+                return;
+
             // Update tooltip
             string tooltip;
             if (Validator.SelectedItem is AssetItem assetItem)