diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-05-29 00:56:25 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-05-29 00:56:25 +0100 |
| commit | f2dd76c91f1fd314df12d5dff3b736daf783b9b3 (patch) | |
| tree | f98fcbdb47f849f3168aaadb0d65e04863c2593f /src | |
| parent | c0a35cebbdd2b2504011ebce1c9885479f78d1d1 (diff) | |
Fix job ordering when sending notification emails (more of #1286).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/job_manager.cc | 15 | ||||
| -rw-r--r-- | src/lib/job_manager.h | 1 | ||||
| -rw-r--r-- | src/wx/job_view.cc | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc index e3b6e257b..6d651d2ba 100644 --- a/src/lib/job_manager.cc +++ b/src/lib/job_manager.cc @@ -90,6 +90,21 @@ JobManager::add (shared_ptr<Job> j) return j; } +shared_ptr<Job> +JobManager::add_after (shared_ptr<Job> after, shared_ptr<Job> j) +{ + { + boost::mutex::scoped_lock lm (_mutex); + list<shared_ptr<Job> >::iterator i = find (_jobs.begin(), _jobs.end(), after); + DCPOMATIC_ASSERT (i != _jobs.end()); + _jobs.insert (i, j); + } + + emit (boost::bind (boost::ref (JobAdded), weak_ptr<Job> (j))); + + return j; +} + list<shared_ptr<Job> > JobManager::get () const { diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h index 9cba0fd09..a382dd736 100644 --- a/src/lib/job_manager.h +++ b/src/lib/job_manager.h @@ -41,6 +41,7 @@ class JobManager : public Signaller, public boost::noncopyable { public: boost::shared_ptr<Job> add (boost::shared_ptr<Job>); + boost::shared_ptr<Job> add_after (boost::shared_ptr<Job> after, boost::shared_ptr<Job> j); std::list<boost::shared_ptr<Job> > get () const; bool work_to_do () const; bool errors () const; diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc index d0086ff81..43d6f2fed 100644 --- a/src/wx/job_view.cc +++ b/src/wx/job_view.cc @@ -142,7 +142,7 @@ JobView::finished () string body = Config::instance()->notification_email(); boost::algorithm::replace_all (body, "$JOB_NAME", _job->name()); boost::algorithm::replace_all (body, "$JOB_STATUS", _job->status()); - JobManager::instance()->add (shared_ptr<Job> (new SendNotificationEmailJob (body))); + JobManager::instance()->add_after (_job, shared_ptr<Job> (new SendNotificationEmailJob (body))); } } } |