From beea3beacba34c11b6b73323f4c3c8590a9aa73e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 11 Feb 2013 00:18:40 +0000
Subject: Basic attempt to catch exceptions in the writer thread and pass them
 safely back to the GUI.

---
 src/lib/encoder.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/lib/encoder.cc')

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 0c810d12c..d64622cba 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -251,6 +251,10 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		return;
 	}
 
+	if (_writer->thrown ()) {
+		_writer->rethrow ();
+	}
+
 	if (_writer->can_fake_write (_video_frames_out)) {
 		_writer->fake_write (_video_frames_out);
 		_have_a_real_frame = false;
-- 
cgit v1.2.3