projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
job.cc
diff --git
a/src/lib/job.cc
b/src/lib/job.cc
index c6a6b90a808fcdd234c053ce1c21a31d3128d3eb..594c0da34f1b5cdc7a55177e61bee698b5ac21d5 100644
(file)
--- a/
src/lib/job.cc
+++ b/
src/lib/job.cc
@@
-281,7
+281,7
@@
Job::error_summary () const
void
Job::set_error (string s, string d)
{
void
Job::set_error (string s, string d)
{
- _film->log()->log (String::compose ("Error in job: %1 (%2)", s, d));
+ _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;