From: Carl Hetherington <cth@carlh.net>
Date: Sat, 6 Jan 2018 23:10:02 +0000 (+0000)
Subject: Catch exceptions thrown when there are bad KDMs added to imported DCPs (#1000).
X-Git-Tag: v2.11.38~4
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=db19d69c0c33fe64cf60ec85bf59c4c15ec37383

Catch exceptions thrown when there are bad KDMs added to imported DCPs (#1000).
---

diff --git a/ChangeLog b/ChangeLog
index ecfc9a73e..c0e5b3468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2018-01-06  Carl Hetherington  <cth@carlh.net>
 
+	* Fix crash in some cases when an incorrect KDM has been
+	added to a DCP (#1000).
+
 	* Updated de_DE translation from Carsten Kurz.
 
 	* Fix playhead wandering on some operations (#1112).
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 174d625b8..68443c0cf 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -143,6 +143,8 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 				}
 			} catch (dcp::DCPReadError) {
 				/* The DCP is probably missing */
+			} catch (dcp::KDMDecryptionError) {
+				/* We have an incorrect KDM */
 			}
 		} else {
 			_kdm->Enable (false);