Releases ThreadSafeFunction callbacks on stop to prevent event loop from persisting.

Author: julianmesa-gitkraken

includes/NSFW.h

@@ -26,7 +26,6 @@ class NSFW : public Napi::ObjectWrap<NSFW> {
     std::string mPath;
     std::thread mPollThread;
     std::atomic<bool> mRunning;
-    std::atomic<bool> mFinalizing;
     std::condition_variable mWaitPoolEvents;
     std::mutex mRunningLock;
     std::vector<std::string> mExcludedPaths;

src/NSFW.cpp

@@ -99,7 +99,6 @@ NSFW::NSFW(const Napi::CallbackInfo &info):
 
 NSFW::~NSFW() {
   if (mRunning) {
-    mFinalizing = true;
     {
       std::lock_guard<std::mutex> lock(mRunningLock);
       mRunning = false;
@@ -213,6 +212,10 @@ void NSFW::StopWorker::Execute() {
   mNSFW->mWaitPoolEvents.notify_one();
   mNSFW->mPollThread.join();
 
+  // Release ThreadSafeFunction callbacks to prevent keeping event loop alive
+  mNSFW->mErrorCallback.Release();
+  mNSFW->mEventCallback.Release();
+
   std::lock_guard<std::mutex> lock(mNSFW->mInterfaceLock);
   mNSFW->mInterface.reset(nullptr);
   mNSFW->mQueue->clear();
@@ -443,13 +446,6 @@ void NSFW::pollForEvents() {
       }
     );
   }
-
-  // If we are destroying NFSW object (destructor) we cannot release the thread safe functions at this point
-  // or we get a segfault
-  if (!mFinalizing) {
-    mErrorCallback.Release();
-    mEventCallback.Release();
-  }
 }
 
 Napi::Value NSFW::ExcludedPaths() {