diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-05-14 20:14:52 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-05-14 20:45:24 +0200 |
| commit | dd0f6069a536f414c5b37c786bb36dfc7fdf3d20 (patch) | |
| tree | 86c23e1e09d8f76972f59d38daaa11483b6fa119 /src/wx | |
| parent | a0bba66b8a34d594a62750bd595e5cdc561abdf4 (diff) | |
Don't say 'certificate downloaded' if it failed during the read part.
Backported from 8c7ad603cf0a534abe1a920b70b0daa095257d3a in v2.15.x
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/download_certificate_panel.cc | 9 | ||||
| -rw-r--r-- | src/wx/download_certificate_panel.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc index 2f3b435ef..461c68966 100644 --- a/src/wx/download_certificate_panel.cc +++ b/src/wx/download_certificate_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -22,10 +22,12 @@ #include "download_certificate_panel.h" #include "download_certificate_dialog.h" #include "lib/signal_manager.h" +#include "lib/compose.hpp" #include <dcp/util.h> #include <dcp/exceptions.h> #include <boost/bind.hpp> +using std::string; using boost::function; using boost::optional; @@ -51,14 +53,15 @@ DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* d _overall_sizer->SetSizeHints (this); } -void +optional<string> DownloadCertificatePanel::load (boost::filesystem::path file) { try { _certificate = dcp::Certificate (dcp::file_to_string (file)); } catch (dcp::MiscError& e) { - error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what())); + return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what()); } + return optional<string>(); } optional<dcp::Certificate> diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h index 55594c74c..dee76c435 100644 --- a/src/wx/download_certificate_panel.h +++ b/src/wx/download_certificate_panel.h @@ -37,7 +37,7 @@ public: virtual bool ready_to_download () const; void download (); - void load (boost::filesystem::path); + boost::optional<std::string> load (boost::filesystem::path); boost::optional<dcp::Certificate> certificate () const; protected: |