fix: another source of NRE in CurrentComponentStructure (#522)

bdunderscore · Jan 26, 2025 · 705cb7b · 705cb7b
1 parent e575f81
commit 705cb7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Fixed
+- Fixed another source of NullReferenceErrors after deleting game objects (#522)
 
 ### Changed
 

diff --git a/Editor/ChangeStream/ShadowGameObject.cs b/Editor/ChangeStream/ShadowGameObject.cs
@@ -807,6 +807,8 @@ internal int[] CurrentComponentStructure
         {
             get
             {
+                if (GameObject == null) return Array.Empty<int>();
+
                 var comps = GameObject.GetComponents<Component>();
                 var instanceIds = new int[comps.Length];
-Original file line number
+Diff line change
@@ Expand Up / @@ -807,6 +807,8 @@ internal int[] CurrentComponentStructure @@
             {
                 get
                 {
+                    if (GameObject == null) return Array.Empty<int>();
                     var comps = GameObject.GetComponents<Component>();
                     var instanceIds = new int[comps.Length];
@@ Expand Down @@