Revert overwrite changes; remove our replacement of file extension (#1383).

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 8bf2d0e419856ddd96096bbb8f2c0c7f16a0bb35..8f00861858dad799a0aae6f180b858ff2661b5fa 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -45,7 +45,7 @@ column (dcp::Certificate c)
 class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
 {
 public:
-       CertificateFileDialogWrapper (wxWindow* parent)
+       explicit CertificateFileDialogWrapper (wxWindow* parent)
                : FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
        {
 
@@ -153,9 +153,13 @@ ScreenDialog::load_recipient (boost::filesystem::path file)
        try {
                /* Load this as a chain, in case it is one, and then pick the leaf certificate */
                dcp::CertificateChain c (dcp::file_to_string (file));
+               if (c.unordered().empty()) {
+                       error_dialog (this, _("Could not read certificate file."));
+                       return;
+               }
                set_recipient (c.leaf ());
        } catch (dcp::MiscError& e) {
-               error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data()));
+               error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
        }
 }