X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fgdc_certificate_panel.cc;h=f7f86895df931eaaf307d0277a2b1c2914d74465;hb=31de5b1272d928557a7272977584f5dcc9876c75;hp=ffd7de52f444626d58cc2e6568e7aba6d8220da2;hpb=2c844e57ed5c54e65a2b4484f02907122a03361e;p=dcpomatic.git diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc index ffd7de52f..f7f86895d 100644 --- a/src/wx/gdc_certificate_panel.cc +++ b/src/wx/gdc_certificate_panel.cc @@ -28,6 +28,9 @@ using std::string; using boost::optional; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif GDCCertificatePanel::GDCCertificatePanel (DownloadCertificateDialog* dialog) : CredentialsDownloadCertificatePanel ( @@ -46,11 +49,16 @@ GDCCertificatePanel::GDCCertificatePanel (DownloadCertificateDialog* dialog) void GDCCertificatePanel::do_download () { + string serial = wx_to_std (_serial->GetValue()); + if (!serial.empty() && serial[0] == 'A') { + /* We're adding the A ourselves */ + serial = serial.substr(1); + } string const url = String::compose( "ftp://%1:%2@ftp.gdc-tech.com/SHA256/A%3.crt.pem", Config::instance()->gdc_username().get(), Config::instance()->gdc_password().get(), - wx_to_std(_serial->GetValue()) + serial ); optional error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1));