Merge master.

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 2ac8c60771b1c960850b4805ff1ca550fbb1cd3a..c6a6b90a808fcdd234c053ce1c21a31d3128d3eb 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,6 +29,8 @@
 #include "cross.h"
 #include "ui_signaller.h"
 #include "exceptions.h"
+#include "film.h"
+#include "log.h"
 
 #include "i18n.h"
 
@@ -67,7 +69,7 @@ Job::run_wrapper ()
                run ();
 
        } catch (dcp::FileError& e) {
-               
+
                string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
                try {
@@ -108,7 +110,7 @@ Job::run_wrapper ()
 
                set_error (
                        e.what (),
-                       _("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
+                       _("It is not known what caused this error.  Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).")
                        );
 
                set_progress (1);
@@ -118,7 +120,7 @@ Job::run_wrapper ()
 
                set_error (
                        _("Unknown error"),
-                       _("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
+                       _("It is not known what caused this error.  Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).")
                        );
 
                set_progress (1);
@@ -186,33 +188,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 DCPTime (in seconds) that this sub-job has been running */
@@ -290,6 +281,7 @@ Job::error_summary () const
 void
 Job::set_error (string s, string d)
 {
+       _film->log()->log (String::compose ("Error in job: %1 (%2)", s, d));
        boost::mutex::scoped_lock lm (_state_mutex);
        _error_summary = s;
        _error_details = d;