Various KDM and encryption fixes.

[dcpomatic.git] / src / wx / screen_dialog.cc

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 7ff5197137cd27e6d06c25e3d0326fb684d34bf0..6584e1ad6e92ba1b8a04a34ab761efdfa332b03b 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -84,14 +84,15 @@ void
 ScreenDialog::load_certificate (wxCommandEvent &)
 {
        wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
-       d->ShowModal ();
-       
-       try {
-               _certificate.reset (new libdcp::Certificate (wx_to_std (d->GetPath ())));
-               _certificate_text->SetValue (_certificate->certificate ());
-       } catch (libdcp::MiscError& e) {
-               error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
-       }
 
+       if (d->ShowModal () == wxID_OK) {
+               try {
+                       _certificate.reset (new libdcp::Certificate (boost::filesystem::path (wx_to_std (d->GetPath ()))));
+                       _certificate_text->SetValue (_certificate->certificate ());
+               } catch (libdcp::MiscError& e) {
+                       error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
+               }
+       }
+       
        d->Destroy ();
 }