projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5892c7e
)
Allow _film to be 0.
author
Carl Hetherington
<cth@carlh.net>
Tue, 6 Oct 2015 11:36:59 +0000
(12:36 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 9 Oct 2015 12:44:49 +0000
(13:44 +0100)
src/lib/job.cc
patch
|
blob
|
history
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index 7aaac748c115a1d9e65144027e7eacf96f1d6640..91581eb49550db343718606c5ede43ab249f6774 100644
(file)
--- 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);
#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)
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);
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;
boost::mutex::scoped_lock lm (_state_mutex);
_error_summary = s;
_error_details = d;