X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=36187e00f307849308577fec31f512e7ee06171a;hb=5c9e39df078aab9f03ae186d0758d4d710f90bab;hp=2a91831341fc506bbd1ed739febb19db3c02c946;hpb=173fc4c4ca837cbea881efc361604b82806a1807;p=dcpomatic.git 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 #include #include @@ -145,6 +146,8 @@ ContentMenu::popup (weak_ptr 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; }