summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-28 23:26:00 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-28 23:26:00 +0100
commitec97893127a2d59871d92c9e658b6b1ab3100b40 (patch)
tree47151780708e655460c0742703edc987114de988 /src
parent7962e6cfd5fbd97e1e44aebe3fc190c62da027e9 (diff)
parentc688d6a6e28f22a01316f67875f30db3d029affb (diff)
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src')
-rw-r--r--src/lib/job.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 0cbf13640..7539a5070 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -176,7 +176,7 @@ Job::run_wrapper ()
} catch (dcp::DCPReadError& e) {
- set_error (e.what(), "");//message(), e.detail().get_value_or(""));
+ set_error (e.message(), e.detail().get_value_or(""));
set_progress (1);
set_state (FINISHED_ERROR);
@@ -399,8 +399,6 @@ void
Job::set_error (string s, string d)
{
if (_film) {
- LOG_ERROR_NC (s);
- LOG_ERROR_NC (d);
_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), LogEntry::TYPE_ERROR);
}