From d4f3df54c143b4d99dc06765208b62105f0cdca1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 14 Oct 2019 15:59:26 +0200 Subject: [PATCH] Possible fix for sporadic test failures where DCPs are checked before they are made. --- src/lib/check_content_change_job.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc index 0b52f414b..3d5e4e979 100644 --- a/src/lib/check_content_change_job.cc +++ b/src/lib/check_content_change_job.cc @@ -82,9 +82,6 @@ CheckContentChangeJob::run () JobManager::instance()->add(shared_ptr(new ExamineContentJob(_film, i))); } - set_progress (1); - set_state (FINISHED_OK); - if (!changed.empty()) { 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) { @@ -96,4 +93,12 @@ CheckContentChangeJob::run () } else if (_following) { 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); } -- 2.30.2