X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob_manager.cc;h=056b9f925e1b237946122d804241614bb87f416c;hb=2d5b8cdde08044d323aa7193dfac6c9f8bca7131;hp=a841fa60bd553698a873e7105d5f2086e8e4040b;hpb=b8724f408298ff3e804fb821fa15d3bcded0e3db;p=dcpomatic.git

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index a841fa60b..056b9f925 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -37,9 +37,23 @@ using boost::weak_ptr;
 JobManager* JobManager::_instance = 0;
 
 JobManager::JobManager ()
-	: _last_active_jobs (false)
+	: _terminate (false)
+	, _last_active_jobs (false)
+	, _scheduler (new boost::thread (boost::bind (&JobManager::scheduler, this)))
 {
-	boost::thread (boost::bind (&JobManager::scheduler, this));
+	
+}
+
+JobManager::~JobManager ()
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_terminate = true;
+	}
+
+	if (_scheduler->joinable ()) {
+		_scheduler->join ();
+	}
 }
 
 shared_ptr<Job>
@@ -98,6 +112,10 @@ JobManager::scheduler ()
 
 		{
 			boost::mutex::scoped_lock lm (_mutex);
+			if (_terminate) {
+				return;
+			}
+			
 			for (list<shared_ptr<Job> >::iterator i = _jobs.begin(); i != _jobs.end(); ++i) {
 
 				if (!(*i)->finished ()) {
@@ -138,3 +156,10 @@ JobManager::instance ()
 
 	return _instance;
 }
+
+void
+JobManager::drop ()
+{
+	delete _instance;
+	_instance = 0;
+}