Fix refusal to start another audio analysis job after cancelling one. v2.15.98
authorCarl Hetherington <cth@carlh.net>
Fri, 14 Aug 2020 18:28:21 +0000 (20:28 +0200)
committerCarl Hetherington <cth@carlh.net>
Fri, 14 Aug 2020 18:28:34 +0000 (20:28 +0200)
src/lib/job_manager.cc

index 9eb51aee5bd226ac0facf16285c99b1753fdf01e..dbaf15cbce150c400143417dcb6be04772e1300b 100644 (file)
@@ -228,7 +228,7 @@ JobManager::analyse_audio (
 
                BOOST_FOREACH (shared_ptr<Job> i, _jobs) {
                        shared_ptr<AnalyseAudioJob> a = dynamic_pointer_cast<AnalyseAudioJob> (i);
-                       if (a && a->path() == film->audio_analysis_path(playlist)) {
+                       if (a && a->path() == film->audio_analysis_path(playlist) && !i->finished_cancelled()) {
                                i->when_finished (connection, ready);
                                return;
                        }