Merge pull request #79151 from RedworkDE/net-unregister-godotobject-c…

…heck C#: Add null check before calling `UnregisterGodotObject`
godotengine · Jul 7, 2023 · c3b0a92 · c3b0a92
2 parents dcbbde5 + 693e6e0
commit c3b0a92
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotObject.base.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/GodotObject.base.cs
@@ -125,7 +125,10 @@ protected virtual void Dispose(bool disposing)
  NativePtr = IntPtr.Zero;
  }
 
- DisposablesTracker.UnregisterGodotObject(this, _weakReferenceToSelf);
+ if (_weakReferenceToSelf != null)
+ {
+ DisposablesTracker.UnregisterGodotObject(this, _weakReferenceToSelf);
+ }
  }
 
  /// <summary>