Enabled stopWorkers flag to terminate threads

Author: Chris Sullivan

include/ThreadPool.hh

@@ -63,6 +63,7 @@ public:
                     m_promises[mypromise].set_value();
                 });
             }
+            WorkType work;
             if (m_taskQueue.try_dequeue(work)) work(); // master thread is also a worker
             Finish();
         }

src/ThreadPool.cc

@@ -7,20 +7,14 @@ ThreadPool::ThreadPool(uint32_t numthreads) : m_nthreads(numthreads), m_stopWork
 }
 ThreadPool::~ThreadPool() {
     m_stopWorkers = true;
-    m_taskQueue.join();
     JoinAll();
 }
 
 void ThreadPool::Worker() {
     while(true) {
         function<void()> work;
-        try {
-            if (m_taskQueue.try_dequeue(work)) work();
-        }
-        catch (const ThreadsafeQueue<WorkType>::QueueFinished&)
-        {
-            return;
-        }
+        if (m_taskQueue.try_dequeue(work)) work();
+        if (m_stopWorkers) return;
     }
 }
 void ThreadPool::JoinAll() {