From a45dd41c4dc7b95b1e3e79640e965ae663e7e680 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 4 Sep 2018 00:31:38 +0100
Subject: Return 0 from decoder_factory when we have a DCP with no KDM, rather
 than throwing an exception.

---
 src/lib/decoder_factory.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index 02d7064f4..b9baefa80 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -46,7 +46,12 @@ decoder_factory (shared_ptr<const Content> content, shared_ptr<Log> log, bool fa
 
 	shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (content);
 	if (dc) {
-		return shared_ptr<Decoder> (new DCPDecoder (dc, log, fast));
+		try {
+			return shared_ptr<Decoder> (new DCPDecoder (dc, log, fast));
+		} catch (KDMError& e) {
+			/* This will be found and reported to the user when the content is examined */
+			return 0;
+		}
 	}
 
 	shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (content);
-- 
cgit v1.2.3