Separate static and instance accessor deleters

nodejs · Sep 23, 2018 · 083b2ec · 083b2ec
1 parent 963e0f8
commit 083b2ec
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/napi-inl.h b/napi-inl.h
@@ -3030,13 +3030,16 @@ inline Function ObjectWrap<T>::DefineClass(napi_env env,
     const napi_property_descriptor* prop = &desc[idx];
 
     if (prop->getter == T::StaticGetterCallbackWrapper ||
-        prop->setter == T::StaticSetterCallbackWrapper ||
-        prop->getter == T::InstanceGetterCallbackWrapper ||
-        prop->setter == T::InstanceSetterCallbackWrapper) {
+        prop->setter == T::StaticSetterCallbackWrapper) {
       status = Napi::details::AttachData(env,
                           constructor,
                           static_cast<StaticAccessorCallbackData*>(prop->data));
       NAPI_THROW_IF_FAILED(env, status, Function());
+    } else if (prop->getter == T::InstanceGetterCallbackWrapper ||
+        prop->setter == T::InstanceSetterCallbackWrapper) {
+      status = Napi::details::AttachData(env,
+                          constructor,
+                          static_cast<InstanceAccessorCallbackData*>(prop->data));
     } else if (prop->method != nullptr && !(prop->attributes & napi_static)) {
       if (prop->method == T::InstanceVoidMethodCallbackWrapper) {
         status = Napi::details::AttachData(env,