Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / job_manager.cc

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 0597983db355ddb7855310fa708ca916683f9608..86e010c106b929d0cb6869026eda4a70baab86e5 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -62,6 +62,7 @@ JobManager::~JobManager ()
        }
 
        if (_scheduler) {
+               DCPOMATIC_ASSERT (_scheduler->joinable ());
                _scheduler->join ();
        }
 
@@ -180,18 +181,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);