1 files changed, 12 insertions, 11 deletions
diff --git a/Swift/QtUI/CAPICertificateSelector.cpp b/Swift/QtUI/CAPICertificateSelector.cpp
index 36d8c54..e47121b 100644
--- a/Swift/QtUI/CAPICertificateSelector.cpp
+++ b/Swift/QtUI/CAPICertificateSelector.cpp
@@ -20,3 +20,5 @@
 #include <Swift/QtUI/QtSwiftUtil.h>
+
 #include <Swiften/Base/Log.h>
+#include <Swiften/TLS/Schannel/SchannelUtil.h>
 
@@ -89,6 +91,10 @@ std::string selectCAPICertificate() {
 
-
-
+    std::string result;
     /* Call Windows dialog to select a suitable certificate */
-    PCCERT_CONTEXT cert = CryptUIDlgSelectCertificateFromStore(hstore, hwnd, titleChars, promptChars, exclude_columns, 0, NULL);
+    {
+        ScopedCertContext cert(CryptUIDlgSelectCertificateFromStore(hstore, hwnd, titleChars, promptChars, exclude_columns, 0, NULL));
+        if (cert) {
+            result = getCertUri(cert, certStoreName);
+        }
+    }
 
@@ -98,10 +104,5 @@ std::string selectCAPICertificate() {
     if (hstore) {
-        CertCloseStore(hstore, 0);
-    }
-
-    std::string result;
-
-    if (cert) {
-        result = getCertUri(cert, certStoreName);
-        CertFreeCertificateContext(cert);
+        if (CertCloseStore(hstore, 0) == FALSE) {
+            SWIFT_LOG(debug) << "Failed to close the certificate store handle." << std::endl;
+        }
     }