@@ -150,9 +150,6 @@ struct ThreadSafeFinalize {
150
150
ThreadSafeFinalize* finalizeData =
151
151
static_cast <ThreadSafeFinalize*>(rawFinalizeData);
152
152
finalizeData->callback (Env (env));
153
- if (finalizeData->tsfn ) {
154
- *finalizeData->tsfn = nullptr ;
155
- }
156
153
delete finalizeData;
157
154
}
158
155
@@ -166,9 +163,6 @@ struct ThreadSafeFinalize {
166
163
ThreadSafeFinalize* finalizeData =
167
164
static_cast <ThreadSafeFinalize*>(rawFinalizeData);
168
165
finalizeData->callback (Env (env), finalizeData->data );
169
- if (finalizeData->tsfn ) {
170
- *finalizeData->tsfn = nullptr ;
171
- }
172
166
delete finalizeData;
173
167
}
174
168
@@ -182,9 +176,6 @@ struct ThreadSafeFinalize {
182
176
ThreadSafeFinalize* finalizeData =
183
177
static_cast <ThreadSafeFinalize*>(rawFinalizeData);
184
178
finalizeData->callback (Env (env), static_cast <ContextType*>(rawContext));
185
- if (finalizeData->tsfn ) {
186
- *finalizeData->tsfn = nullptr ;
187
- }
188
179
delete finalizeData;
189
180
}
190
181
@@ -199,15 +190,11 @@ struct ThreadSafeFinalize {
199
190
static_cast <ThreadSafeFinalize*>(rawFinalizeData);
200
191
finalizeData->callback (Env (env), finalizeData->data ,
201
192
static_cast <ContextType*>(rawContext));
202
- if (finalizeData->tsfn ) {
203
- *finalizeData->tsfn = nullptr ;
204
- }
205
193
delete finalizeData;
206
194
}
207
195
208
196
FinalizerDataType* data;
209
197
Finalizer callback;
210
- napi_threadsafe_function* tsfn;
211
198
};
212
199
#endif
213
200
@@ -4528,7 +4515,7 @@ inline ThreadSafeFunction ThreadSafeFunction::New(napi_env env,
4528
4515
4529
4516
ThreadSafeFunction tsfn;
4530
4517
auto * finalizeData = new details::ThreadSafeFinalize<ContextType, Finalizer,
4531
- FinalizerDataType>({ data, finalizeCallback, &tsfn. _tsfn });
4518
+ FinalizerDataType>({ data, finalizeCallback });
4532
4519
napi_status status = napi_create_threadsafe_function (env, callback, resource,
4533
4520
Value::From (env, resourceName), maxQueueSize, initialThreadCount,
4534
4521
finalizeData, wrapper, context, CallJS, &tsfn._tsfn );
0 commit comments