diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-07 19:35:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-07 19:35:42 +0100 |
| commit | 5c9e39df078aab9f03ae186d0758d4d710f90bab (patch) | |
| tree | 24ba2ec0e0d1e0f55411efed26396ad93f6879a0 /src/wx/content_menu.cc | |
| parent | 173fc4c4ca837cbea881efc361604b82806a1807 (diff) | |
Give better errors when incorrect KDMs are used (#1326).
Diffstat (limited to 'src/wx/content_menu.cc')
| -rw-r--r-- | src/wx/content_menu.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 2a9183134..36187e00f 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -35,6 +35,7 @@ #include "lib/dcp_examiner.h" #include "lib/ffmpeg_content.h" #include "lib/audio_content.h" +#include "lib/config.h" #include <dcp/cpl.h> #include <dcp/exceptions.h> #include <wx/wx.h> @@ -145,6 +146,8 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList /* The DCP is probably missing */ } catch (dcp::KDMDecryptionError) { /* We have an incorrect KDM */ + } catch (KDMError) { + /* We have an incorrect KDM */ } } else { _kdm->Enable (false); @@ -377,7 +380,7 @@ ContentMenu::kdm () try { dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))); } catch (exception& e) { - error_dialog (_parent, wxString::Format (_("Could not load KDM.")), std_to_wx(e.what())); + error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what())); d->Destroy (); return; } |