X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fjob_manager.cc;h=c9924d226426c0da60d358d9b362fcd6f4d356f4;hb=8862cbbb7e857c90d405069ad7d41a8d58029194;hp=0597983db355ddb7855310fa708ca916683f9608;hpb=b0834f33e972a6e7b0d234d09e420007943a136d;p=dcpomatic.git

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 0597983db..c9924d226 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -62,7 +63,12 @@ JobManager::~JobManager ()
 	}
 
 	if (_scheduler) {
-		_scheduler->join ();
+		/* Ideally this would be a DCPOMATIC_ASSERT(_scheduler->joinable()) but we
+		   can't throw exceptions from a destructor.
+		*/
+		if (_scheduler->joinable ()) {
+			_scheduler->join ();
+		}
 	}
 
 	delete _scheduler;
@@ -180,18 +186,22 @@ JobManager::analyse_audio (
 	function<void()> ready
 	)
 {
-	shared_ptr<AnalyseAudioJob> job;
-
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 
 		BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
 			shared_ptr<AnalyseAudioJob> a = dynamic_pointer_cast<AnalyseAudioJob> (i);
-			if (a && film->audio_analysis_path (a->playlist ()) == film->audio_analysis_path (playlist)) {
+			if (a && a->playlist () == playlist) {
 				i->when_finished (connection, ready);
 				return;
 			}
 		}
+	}
+
+	shared_ptr<AnalyseAudioJob> job;
+
+	{
+		boost::mutex::scoped_lock lm (_mutex);
 
 		job.reset (new AnalyseAudioJob (film, playlist));
 		connection = job->Finished.connect (ready);