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

diff --git a/ChangeLog b/ChangeLog
index ecfc9a73e940a1cbe5b1c67198736de16e107e2b..c0e5b3468344709902f8890274bed2d083fa9168 100644 (file)
--- 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 174d625b8c1eea2fdee199f36b67203a83540cd7..68443c0cf428fd10b0dfc3cb57ef7b1f400231df 100644 (file)
--- 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);