From 7a492b88bb30e084d95e5652e8067d21eead1feb Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 25 Feb 2018 00:40:30 +0000
Subject: Handle errors in subtitle XML better (#1209).

---
 src/lib/job.cc                | 6 ++++++
 src/tools/dcpomatic_player.cc | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 61c5b3767..430decceb 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -171,6 +171,12 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (dcp::DCPReadError& e) {
+
+		set_error (e.message(), e.detail().get_value_or(""));
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (std::exception& e) {
 
 		set_error (
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 3e36b575b..d42320bfd 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -181,7 +181,7 @@ public:
 
 		shared_ptr<Job> last = jm->get().back();
 		if (last->finished_in_error()) {
-			error_dialog (this, std_to_wx (last->error_summary()) + ".\n");
+			error_dialog(this, std_to_wx(last->error_summary()) + ".\n", std_to_wx(last->error_details()));
 			return;
 		}
 
-- 
cgit v1.2.3