Display the filename / URL that a screen certificate was obtained from (#1894).

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

diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 4d9b1fcb71ab81961832a312519f13a5258f2576..77516fb8229d306f66c67345140ff217a0473868 100644 (file)
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -64,13 +64,13 @@ ChristieCertificatePanel::do_download ()
        optional<string> all_errors;
        bool ok = true;
 
        optional<string> all_errors;
        bool ok = true;
 

-       optional<string> error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1));
+       auto error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1, _2));

        if (error) {
                all_errors = *error;
 
                auto const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial);
 
        if (error) {
                all_errors = *error;
 
                auto const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial);
 

-               error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1));
+               error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1, _2));

                if (error) {
                        *all_errors += "\n" + *error;
                        ok = false;
                if (error) {
                        *all_errors += "\n" + *error;
                        ok = false;