From db19d69c0c33fe64cf60ec85bf59c4c15ec37383 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 6 Jan 2018 23:10:02 +0000 Subject: Catch exceptions thrown when there are bad KDMs added to imported DCPs (#1000). --- ChangeLog | 3 +++ src/wx/content_menu.cc | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index ecfc9a73e..c0e5b3468 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2018-01-06 Carl Hetherington + * 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, ContentList c, TimelineContentViewList } } catch (dcp::DCPReadError) { /* The DCP is probably missing */ + } catch (dcp::KDMDecryptionError) { + /* We have an incorrect KDM */ } } else { _kdm->Enable (false); -- cgit v1.2.3