aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-05-21 21:59:56 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-05-21 22:00:07 +0200
commit4bf83b27b282ac5905ec428c1772ff8242d1c53a (patch)
treed53175023a197c475a2c3d797367867bfde80791
parent0d862c2739b96005fdf0e2a4df347e7291956fc1 (diff)
parentbdcf5dea7c2e7493be7d8fc157e168b77cce7dcc (diff)
Merge pull request #6171
bdcf5de Fix intermittent hang issue in scheduler_tests (Wladimir J. van der Laan)
-rw-r--r--src/scheduler.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 4f1d8be7c0..c42eb7244d 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -29,8 +29,6 @@ void CScheduler::serviceQueue()
{
boost::unique_lock<boost::mutex> lock(newTaskMutex);
++nThreadsServicingQueue;
- stopRequested = false;
- stopWhenEmpty = false;
// newTaskMutex is locked throughout this loop EXCEPT
// when the thread is waiting or when the user's function