From f89455549eadff153ebf0a923fe20df7737f97ac Mon Sep 17 00:00:00 2001
From: Sinai <outlander.sinai@gmail.com>
Date: Fri, 16 Apr 2021 02:46:04 +1000
Subject: [PATCH] safer UIBehaviour instance updates, init method

---
 src/UI/Model/UIBehaviourModel.cs | 33 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/UI/Model/UIBehaviourModel.cs b/src/UI/Model/UIBehaviourModel.cs
index 21a812b..f6228f5 100644
--- a/src/UI/Model/UIBehaviourModel.cs
+++ b/src/UI/Model/UIBehaviourModel.cs
@@ -15,26 +15,37 @@ namespace UnityExplorer.UI.Models
             if (!Instances.Any())
                 return;
 
-            for (int i = Instances.Count - 1; i >= 0; i--)
+            try
             {
-                var instance = Instances[i];
-                if (!instance.UIRoot)
-                    Instances.RemoveAt(i);
-                else if (instance.NeedsUpdate && instance.Visible)
-                    instance.Update();
+                for (int i = Instances.Count - 1; i >= 0; i--)
+                {
+                    var instance = Instances[i];
+                    if (instance == null || !instance.UIRoot)
+                    {
+                        ExplorerCore.Log($"Instance {instance?.GetType().Name ?? "<null>"} has no UIRoot or it was destroyed!");
+                        Instances.RemoveAt(i);
+                        continue;
+                    }
+                    if (instance.Visible)
+                        instance.Update();
+                }
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.Log(ex);
             }
         }
 
-        /// <summary>
-        /// Default false, if true then Update should be implemented.
-        /// </summary>
-        public virtual bool NeedsUpdate => false;
-
         public UIBehaviourModel()
         {
             Instances.Add(this);
         }
 
+        public virtual void Init()
+        {
+
+        }
+
         /// <summary>
         /// Default empty method, override and implement if NeedsUpdateTick is true.
         /// </summary>