projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
[dcpomatic.git]
/
src
/
wx
/
gdc_certificate_panel.cc
diff --git
a/src/wx/gdc_certificate_panel.cc
b/src/wx/gdc_certificate_panel.cc
index b4352dff4ef70c1c6d559b32017a435967aeac48..b0bb31674458fc7711a7c6bf634660f1ba73dcb9 100644
(file)
--- a/
src/wx/gdc_certificate_panel.cc
+++ b/
src/wx/gdc_certificate_panel.cc
@@
-45,13
+45,13
@@
GDCCertificatePanel::do_download ()
}
string const url = String::compose(
}
string const url = String::compose(
- "ftp://%1:%2@ftp.gdc-tech.com/SHA256/A%3",
+ "ftp://%1:%2@ftp.gdc-tech.com/SHA256/A%3
.crt.pem
",
Config::instance()->gdc_username().get(),
Config::instance()->gdc_password().get(),
Config::instance()->gdc_username().get(),
Config::instance()->gdc_password().get(),
- serial
+ wx_to_std(_serial->GetValue())
);
);
- optional<string> error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+ optional<string> error = get_from_url (url, true,
false,
boost::bind (&DownloadCertificatePanel::load, this, _1));
if (error) {
_dialog->message()->SetLabel(wxT(""));
if (error) {
_dialog->message()->SetLabel(wxT(""));