Check for drawObject != null before invoking draw object created event.

xivdev · Sep 2, 2023 · b985833 · b985833
1 parent 0dbe9b5
commit b985833
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Penumbra/Interop/PathResolving/MetaState.cs b/Penumbra/Interop/PathResolving/MetaState.cs
@@ -140,7 +140,7 @@ private void OnCharacterBaseCreated(uint _1, nint _2, nint _3, nint drawObject)
     {
         _characterBaseCreateMetaChanges.Dispose();
         _characterBaseCreateMetaChanges = DisposableContainer.Empty;
-        if (_lastCreatedCollection.Valid && _lastCreatedCollection.AssociatedGameObject != nint.Zero)
+        if (_lastCreatedCollection.Valid && _lastCreatedCollection.AssociatedGameObject != nint.Zero && drawObject != nint.Zero)
             _communicator.CreatedCharacterBase.Invoke(_lastCreatedCollection.AssociatedGameObject,
                 _lastCreatedCollection.ModCollection, drawObject);
         _lastCreatedCollection = ResolveData.Invalid;