From 0b16b7fef9abf7a2a853ba926c18968f25f266e5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 5 Mar 2014 16:40:23 +0000
Subject: [PATCH] Another attempt to fix the race in dcpomatic_create.

---
 src/lib/job.cc                | 25 +++++++------------------
 src/lib/ui_signaller.h        |  4 ++--
 src/tools/dcpomatic_create.cc |  6 +++---
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/lib/job.cc b/src/lib/job.cc
index db9a9b215..52499b433 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -186,33 +186,22 @@ Job::paused () const
 void
 Job::set_state (State s)
 {
-	bool const finished = (s == FINISHED_OK || s == FINISHED_ERROR || s == FINISHED_CANCELLED);
-	
-	/* Do this first, so that we handle things that should happen on finish before the
-	 * job is actually marked as such.  This is important for callers that do:
-	 *
-	 * while (JobManager::work_to_do ()) {
-	 *   ui_signaller->ui_idle ();
-	 * }
-	 *
-	 * as otherwise this loop can finish before the Finished handler has been executed
-	 * (job finishes, calls set_state(), this sets the state and sets a pending signal
-	 * for Finished, but this is never called as a ui_idle() never happens as work_to_do()
-	 * is now false).
-	 */
-	if (finished && ui_signaller) {
-		ui_signaller->emit (boost::bind (boost::ref (Finished)));
-	}
+	bool finished = false;
 
 	{
 		boost::mutex::scoped_lock lm (_state_mutex);
 		_state = s;
 
-		if (finished) {
+		if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
 			_ran_for = elapsed_time ();
+			finished = true;
 			_sub_name.clear ();
 		}
 	}
+
+	if (finished && ui_signaller) {
+		ui_signaller->emit (boost::bind (boost::ref (Finished)));
+	}	
 }
 
 /** @return Time (in seconds) that this sub-job has been running */
diff --git a/src/lib/ui_signaller.h b/src/lib/ui_signaller.h
index 7e0f57513..1d62547f6 100644
--- a/src/lib/ui_signaller.h
+++ b/src/lib/ui_signaller.h
@@ -55,8 +55,8 @@ public:
 	}
 
 	/** Call this in the UI when it is idle */
-	void ui_idle () {
-		_service.poll ();
+	size_t ui_idle () {
+		return _service.poll ();
 	}
 
 	/** This should wake the UI and make it call ui_idle() */
diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 36e04120e..a49780276 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -182,9 +182,9 @@ main (int argc, char* argv[])
 		}
 		
 		JobManager* jm = JobManager::instance ();
-		while (jm->work_to_do ()) {
-			ui_signaller->ui_idle ();
-		}
+
+		while (jm->work_to_do ()) {}
+		while (ui_signaller->ui_idle() > 0) {}
 
 		ContentList content = film->content ();
 		for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
-- 
2.30.2