BabylonJS · ryantrem · Jan 21, 2025 · Jan 13, 2025 · Jan 13, 2025 · Jan 14, 2025
diff --git a/Core/Node-API/Include/Shared/napi/napi-inl.h b/Core/Node-API/Include/Shared/napi/napi-inl.h
@@ -4513,7 +4513,7 @@ template <typename T>
 inline ObjectWrap<T>::~ObjectWrap() {
   // If the JS object still exists at this point, remove the finalizer added
   // through `napi_wrap()`.
-  if (!IsEmpty()) {
+  if (!IsEmpty() && !_finalized) {
     Object object = Value();
     // It is not valid to call `napi_remove_wrap()` with an empty `object`.
     // This happens e.g. during garbage collection.
@@ -4955,6 +4955,7 @@ inline void ObjectWrap<T>::FinalizeCallback(napi_env env,
                                             void* /*hint*/) {
   HandleScope scope(env);
   T* instance = static_cast<T*>(data);
+  instance->_finalized = true;
   instance->Finalize(Napi::Env(env));
   delete instance;
 }

diff --git a/Core/Node-API/Include/Shared/napi/napi.h b/Core/Node-API/Include/Shared/napi/napi.h
@@ -2497,6 +2497,7 @@ class ObjectWrap : public InstanceWrap<T>, public Reference<Object> {
   }
 
   bool _construction_failed = true;
+  bool _finalized = false;
 };
 
 class HandleScope {
-Original file line number
+Diff line change
@@ Expand Up @@
       }
       bool _construction_failed = true;
+      bool _finalized = false;
     };
     class HandleScope {
@@ Expand Down @@