From: Carl Hetherington <cth@carlh.net>
Date: Wed, 20 May 2020 19:55:13 +0000 (+0200)
Subject: Fix DCP playback when an incorrect KDM is added, followed by
X-Git-Tag: v2.15.76~24
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=60f3f8ff110d55e0d720784dd40c9bc62d342d2c

Fix DCP playback when an incorrect KDM is added, followed by
a correct one.
---

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 19831185d..ab724cd6c 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -451,7 +451,9 @@ DCPDecoder::calculate_lazy_digest (shared_ptr<const DCPContent> c) const
 	BOOST_FOREACH (boost::filesystem::path i, c->paths()) {
 		d.add (i.string());
 	}
-	d.add (static_cast<bool>(_dcp_content->kdm()));
+	if (_dcp_content->kdm()) {
+		d.add(_dcp_content->kdm()->id());
+	}
 	d.add (static_cast<bool>(c->cpl()));
 	if (c->cpl()) {
 		d.add (c->cpl().get());