diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-06 12:36:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:44:49 +0100 |
| commit | 09c79795becef84621fc1ab411ee72f3d7bea950 (patch) | |
| tree | 13a834a46963dc82d316d07531e5075819c998a9 /src/lib | |
| parent | 5892c7e3bd9f9ef2e6d7d0c73433cf33b11684cf (diff) | |
Allow _film to be 0.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/job.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc index 7aaac748c..91581eb49 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -44,6 +44,7 @@ using boost::function; #define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR); +/** @param film Associated film, or 0 */ Job::Job (shared_ptr<const Film> film) : _film (film) , _thread (0) @@ -324,7 +325,9 @@ Job::set_error (string s, string d) LOG_ERROR_NC (s); LOG_ERROR_NC (d); - _film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), Log::TYPE_ERROR); + if (_film) { + _film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), Log::TYPE_ERROR); + } boost::mutex::scoped_lock lm (_state_mutex); _error_summary = s; _error_details = d; |