From a6f586564a8f596ab101639298633933a05c0d60 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 26 Aug 2016 09:21:54 +0100
Subject: [PATCH] Fix failure to display when loading old films with imported
 DCPs.

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 2e3ed374a..156fba101 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -73,7 +73,13 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
 		}
 	}
 
-	DCPOMATIC_ASSERT (cpl);
+	if (!cpl) {
+		/* No CPL found; probably an old file that doesn't specify it;
+		   just use the first one.
+		*/
+		cpl = cpls().front ();
+	}
+
 	_reels = cpl->reels ();
 
 	_reel = _reels.begin ();
-- 
2.30.2