Change end() to only do one thing, and copy the required stuff into pause()

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 727456523ca39e7e58f1045fa4df1aea3095d291..9e685ec114cee9d01fe95e998e009b8f59d64390 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -59,6 +59,7 @@ Job::Job (shared_ptr<const Film> film)
        , _state (NEW)
        , _sub_start_time (0)
        , _progress (0)
+       , _rate_limit_progress(true)
 {
 
 }
@@ -111,7 +112,7 @@ Job::run_wrapper ()
 
        } catch (dcp::FileError& e) {
 
-               string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
+               string m = String::compose(_("An error occurred whilst handling the file %1."), e.filename().filename());
 
                try {
                        auto const s = dcp::filesystem::space(e.filename());
@@ -241,6 +242,12 @@ Job::run_wrapper ()
                set_progress(1);
                set_state(FINISHED_ERROR);
 
+       } catch (MissingConfigurationError& e) {
+
+               set_error(e.what());
+               set_progress(1);
+               set_state(FINISHED_ERROR);
+
        } catch (std::exception& e) {
 
                set_error (
@@ -432,7 +439,7 @@ Job::set_progress (float p, bool force)
 {
        check_for_interruption_or_pause ();
 
-       if (!force) {
+       if (!force && _rate_limit_progress) {
                /* Check for excessively frequent progress reporting */
                boost::mutex::scoped_lock lm (_progress_mutex);
                struct timeval now;
@@ -655,7 +662,7 @@ void
 Job::cancel ()
 {
        if (_thread.joinable()) {
-               resume();
+               Job::resume();
 
                _thread.interrupt ();
                _thread.join ();
@@ -682,6 +689,7 @@ Job::pause_by_user ()
        }
 
        if (paused) {
+               pause();
                _pause_changed.notify_all ();
        }
 
@@ -694,6 +702,7 @@ Job::pause_by_priority ()
 {
        if (running ()) {
                set_state (PAUSED_BY_PRIORITY);
+               pause();
                _pause_changed.notify_all ();
        }
 }
@@ -735,3 +744,11 @@ Job::set_message (string m)
        boost::mutex::scoped_lock lm (_state_mutex);
        _message = m;
 }
+
+
+void
+Job::set_rate_limit_progress(bool rate_limit)
+{
+       _rate_limit_progress = rate_limit;
+}
+