X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fchristie_certificate_panel.cc;h=ab131e015cf0ba95135cef0693e38e2b2b743634;hb=c76a7e968f54eb0e6c8da9c1ae6bc069ed05fdda;hp=7db3fef2500303e226d1202e44cc30ad7f340369;hpb=a713e8258acc3f0e960c4e87ba8684902d29a591;p=dcpomatic.git

diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 7db3fef25..ab131e015 100644
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_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
 
 ChristieCertificatePanel::ChristieCertificatePanel (DownloadCertificateDialog* dialog)
 	: CredentialsDownloadCertificatePanel (
@@ -59,25 +62,27 @@ ChristieCertificatePanel::do_download ()
 	string const url = String::compose ("%1F-IMB/F-IMB_%2_sha256.pem", prefix, serial);
 
 	optional<string> all_errors;
+	bool ok = true;
 
-	optional<string> error = get_from_url (url, true, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
+	optional<string> error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1));
 	if (error) {
 		all_errors = *error;
 
 		string const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial);
 
-		error = get_from_url (url, true, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
+		error = get_from_url (url, true, false, boost::bind(&DownloadCertificatePanel::load_certificate_from_chain, this, _1));
 		if (error) {
 			*all_errors += "\n" + *error;
+			ok = false;
 		}
 	}
 
-	if (all_errors) {
-		_dialog->message()->SetLabel(wxT(""));
-		error_dialog (this, std_to_wx(*all_errors));
-	} else {
+	if (ok) {
 		_dialog->message()->SetLabel (_("Certificate downloaded"));
 		_dialog->setup_sensitivity ();
+	} else {
+		_dialog->message()->SetLabel(wxT(""));
+		error_dialog (this, std_to_wx(*all_errors));
 	}
 }