diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/job_manager.cc | 10 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2015-09-15 c.hetherington <cth@carlh.net> + + * Fix failure to display audio analysis + in some cases. + 2015-09-15 Carl Hetherington <cth@carlh.net> * Version 2.3.2 released. diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc index 0597983db..545fd956c 100644 --- a/src/lib/job_manager.cc +++ b/src/lib/job_manager.cc @@ -180,18 +180,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); |