From ce31c4c17fd3c8ff7a16399be890c8294419b45e Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 5 Aug 2018 14:59:28 +0200 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- code/nel/src/gui/curl_certificates.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/nel/src/gui/curl_certificates.cpp b/code/nel/src/gui/curl_certificates.cpp index a279d35f6..e44161882 100644 --- a/code/nel/src/gui/curl_certificates.cpp +++ b/code/nel/src/gui/curl_certificates.cpp @@ -86,7 +86,7 @@ namespace NLGUI } else { - // if CURL is using SSPI under Windows or SecureChannel under OS X, we'll use native system CA Certs + // if CURL is using SSPI or SChannel under Windows or DarwinSSL under OS X, we'll use native system CA Certs isUsingOpenSSLBackend = false; } @@ -122,14 +122,14 @@ namespace NLGUI void addCertificatesFromFile(const std::string &cert) { + if (!isUsingOpenSSLBackend) return; + if (!isInitialized) { nlwarning("You MUST call NLGUI::CCurlCertificates::init before adding new certificates"); return; } - if (!isUsingOpenSSLBackend) return; - // this file was already loaded if (std::find(FilesList.begin(), FilesList.end(), cert) != FilesList.end()) return;