summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-21 17:20:25 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-21 17:20:25 +0100
commit9caf471bebd4d9acd749e11d92494010ca4fd0a7 (patch)
treea339ce17ce8c6f8dd0f70905c4c61456c26c362e /src/lib
parentbab12b895708e797a3c14685c7b0d51887bb510d (diff)
Correctly report exceptions thrown by the thumb encoder.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/examine_content_job.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 40665e1e8..cad560908 100644
--- a/src/lib/examine_content_job.cc
+++ b/src/lib/examine_content_job.cc
@@ -85,8 +85,6 @@ ExamineContentJob::run ()
shared_ptr<ImageMagickEncoder> e (new ImageMagickEncoder (fs, o, _log));
Transcoder w (fs, o, this, _log, e);
w.go ();
- set_progress (1);
- set_state (FINISHED_OK);
} catch (std::exception& e) {
@@ -94,6 +92,7 @@ ExamineContentJob::run ()
set_progress (1);
set_error (e.what ());
set_state (FINISHED_ERROR);
+ return;
}