std::shared_ptr

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

diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc
index 2bc562f57730339bce035be957368f7a29e8d8b2..45a662e37e216dc3a5720441651ec6390c6887fb 100644 (file)
--- a/src/lib/check_content_change_job.cc
+++ b/src/lib/check_content_change_job.cc
@@ -31,7 +31,7 @@
 using std::string;
 using std::list;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 /** @param gui true if we are running this job from the GUI, false if it's the CLI */
 CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film, shared_ptr<Job> following, bool gui)
@@ -42,6 +42,11 @@ CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film, share
 
 }
 
+CheckContentChangeJob::~CheckContentChangeJob ()
+{
+       stop_thread ();
+}
+
 string
 CheckContentChangeJob::name () const
 {
@@ -77,12 +82,11 @@ CheckContentChangeJob::run ()
                }
        }
 
-       BOOST_FOREACH (shared_ptr<Content> i, changed) {
-               JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob(_film, i)));
-       }
-
        if (!changed.empty()) {
                if (_gui) {
+                       BOOST_FOREACH (shared_ptr<Content> i, changed) {
+                               JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob(_film, i)));
+                       }
                        string m = _("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings.");
                        if (_following) {
                                /* I'm assuming that _following is a make DCP job */
@@ -103,6 +107,11 @@ CheckContentChangeJob::run ()
                JobManager::instance()->add (_following);
        }
 
+       /* Only set this job as finished once we have added the following job, otherwise I think
+          it's possible that the tests will sporadically fail if they check for all jobs being
+          complete in the gap between this one finishing and _following being added.
+       */
+
        set_progress (1);
        set_state (FINISHED_OK);
 }