X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcheck_content_change_job.cc;h=c4d050c0e19ea09b7dc6d7e6c8d42568d8876a7f;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=2bc562f57730339bce035be957368f7a29e8d8b2;hpb=bf19399f8c009ff211d5c7b45b0941417d963c4e;p=dcpomatic.git

diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc
index 2bc562f57..c4d050c0e 100644
--- a/src/lib/check_content_change_job.cc
+++ b/src/lib/check_content_change_job.cc
@@ -23,7 +23,6 @@
 #include "examine_content_job.h"
 #include "content.h"
 #include "film.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -31,7 +30,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 +41,11 @@ CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film, share
 
 }
 
+CheckContentChangeJob::~CheckContentChangeJob ()
+{
+	stop_thread ();
+}
+
 string
 CheckContentChangeJob::name () const
 {
@@ -61,7 +65,7 @@ CheckContentChangeJob::run ()
 
 	list<shared_ptr<Content> > changed;
 
-	BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+	for (auto i: _film->content()) {
 		bool ic = false;
 		for (size_t j = 0; j < i->number_of_paths(); ++j) {
 			if (boost::filesystem::last_write_time(i->path(j)) != i->last_write_time(j)) {
@@ -77,12 +81,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) {
+			for (auto 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 +106,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);
 }