Use strcoll() to compare cinemas/screens in the KDM dialog (#1904).

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

diff --git a/src/wx/qube_certificate_panel.cc b/src/wx/qube_certificate_panel.cc
index f6e3049559271e3f161dff2d9d77312068dc0cca..c67cc46f28803ed66c14529b68189b38ec0455ba 100644 (file)
--- a/src/wx/qube_certificate_panel.cc
+++ b/src/wx/qube_certificate_panel.cc
@@ -29,6 +29,9 @@
 using std::string;
 using std::list;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static string const base = "ftp://certificates.qubecinema.com/";
 
@@ -50,7 +53,7 @@ QubeCertificatePanel::do_download ()
 
        string const serial = wx_to_std(_serial->GetValue());
        optional<string> name;
-       BOOST_FOREACH (string i, files) {
+       for (auto i: files) {
                if (boost::algorithm::starts_with(i, String::compose("%1-%2-", _type, serial))) {
                        name = i;
                        break;
@@ -63,7 +66,7 @@ QubeCertificatePanel::do_download ()
                return;
        }
 
-       optional<string> error = get_from_url (String::compose("%1SMPTE-%2/%3", base, _type, *name), true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+       optional<string> error = get_from_url (String::compose("%1SMPTE-%2/%3", base, _type, *name), true, false, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1));
 
        if (error) {
                _dialog->message()->SetLabel(wxT(""));