try get away other callback deprecations

Apollon77 · May 9, 2024 · d724a29 · d724a29
1 parent 9cce2e3
commit d724a29
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/mbus-master.cc b/src/mbus-master.cc
@@ -405,7 +405,7 @@ NAN_METHOD(MbusMaster::Get) {
 
     char *address = get(Nan::To<v8::String>(info[0]).ToLocalChecked(),"0");
     bool ping_first = Nan::To<bool>(info[1]).FromJust();
-    Nan::Callback *callback = obj->connected ? new Nan::Callback(info[2].As<Function>()) : new Nan::Call(info[2].As<Function>());
+    Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
 
     if(obj->connected) {
         obj->communicationInProgress = true;
@@ -415,7 +415,7 @@ NAN_METHOD(MbusMaster::Get) {
         Local<Value> argv[] = {
             Nan::Error("Not connected to port")
         };
-        callback->Call(1, argv);
+        Nan::Call(callback, 1, argv);
     }
     info.GetReturnValue().SetUndefined();
 }
@@ -610,7 +610,7 @@ NAN_METHOD(MbusMaster::ScanSecondary) {
 
     MbusMaster* obj = node::ObjectWrap::Unwrap<MbusMaster>(info.This());
 
-    Nan::Callback *callback = obj->connected ? new Nan::Callback(info[0].As<Function>()) : new Nan::Call(info[0].As<Function>());
+    Nan::Callback *callback = new Nan::Callback(info[0].As<Function>());
     if(obj->connected) {
         obj->communicationInProgress = true;
 
@@ -619,7 +619,7 @@ NAN_METHOD(MbusMaster::ScanSecondary) {
         Local<Value> argv[] = {
             Nan::Error("Not connected to port")
         };
-        callback->Call(1, argv);
+        Nan::Call(callback, 1, argv);
     }
     info.GetReturnValue().SetUndefined();
 }
@@ -797,7 +797,7 @@ NAN_METHOD(MbusMaster::SetPrimaryId) {
 
     char *oldAddress = get(Nan::To<v8::String>(info[0]).ToLocalChecked(),"0");
     int newAddress = (int)Nan::To<int64_t>(info[1]).FromJust();
-    Nan::Callback *callback = obj->connected ? new Nan::Callback(info[2].As<Function>()) : new Nan::Call(info[2].As<Function>());
+    Nan::Callback *callback = new Nan::Callback(info[2].As<Function>());
     if(obj->connected) {
         obj->communicationInProgress = true;
 
@@ -806,7 +806,7 @@ NAN_METHOD(MbusMaster::SetPrimaryId) {
         Local<Value> argv[] = {
             Nan::Error("Not connected to port")
         };
-        callback->Call(1, argv);
+        Nan::Call(callback, 1, argv);
     }
     info.GetReturnValue().SetUndefined();
 }