summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/support/threads.cpp3
-rw-r--r--src/support/threads.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/support/threads.cpp b/src/support/threads.cpp
index ce880ac2d..c4bb6e513 100644
--- a/src/support/threads.cpp
+++ b/src/support/threads.cpp
@@ -47,7 +47,6 @@ Thread::Thread(ThreadPool* parent) : parent(parent) {
}
Thread::~Thread() {
- assert(!parent->isRunning());
{
std::lock_guard<std::mutex> lock(mutex);
// notify the thread that it can exit
@@ -194,7 +193,7 @@ size_t ThreadPool::size() {
bool ThreadPool::isRunning() {
DEBUG_POOL("check if running\n");
- return pool && pool->running;
+ return running;
}
void ThreadPool::notifyThreadIsReady() {
diff --git a/src/support/threads.h b/src/support/threads.h
index 280e19470..e76783ebb 100644
--- a/src/support/threads.h
+++ b/src/support/threads.h
@@ -104,7 +104,7 @@ public:
size_t size();
- static bool isRunning();
+ bool isRunning();
// Called by helper threads when they are free and ready.
void notifyThreadIsReady();