Allow re-start of cancelled subtitle analysis jobs.

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

diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 61087db72c5dccdf50c0efd49696158d95fa5cfb..86230db2b77a7653f86e46bf7165a51ccad84c82 100644 (file)
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -229,7 +229,7 @@ JobManager::analyse_audio (
        shared_ptr<const Playlist> playlist,
        bool from_zero,
        boost::signals2::connection& connection,
-       function<void()> ready
+       function<void (Job::Result)> ready
        )
 {
        {
@@ -264,7 +264,7 @@ JobManager::analyse_subtitles (
        shared_ptr<const Film> film,
        shared_ptr<Content> content,
        boost::signals2::connection& connection,
-       function<void()> ready
+       function<void (Job::Result)> ready
        )
 {
        {
@@ -272,7 +272,7 @@ JobManager::analyse_subtitles (
 
                for (auto i: _jobs) {
                        auto a = dynamic_pointer_cast<AnalyseSubtitlesJob> (i);
-                       if (a && a->path() == film->subtitle_analysis_path(content)) {
+                       if (a && a->path() == film->subtitle_analysis_path(content) && !i->finished_cancelled()) {
                                i->when_finished (connection, ready);
                                return;
                        }