X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmNewAccount-CardDAV2.cpp;h=8e5fe3c701db9d80bf1b89fa487972fb83dd8e83;hp=07f223930c8f6773c23d83e4b2d0baa84823f2c3;hb=547ab1fe605cdb4884179ab011dabba4d0bd7bc2;hpb=a578ed436123242f807cb59eae02fcf6c22e2458

diff --git a/source/frmNewAccount-CardDAV2.cpp b/source/frmNewAccount-CardDAV2.cpp
index 07f2239..8e5fe3c 100644
--- a/source/frmNewAccount-CardDAV2.cpp
+++ b/source/frmNewAccount-CardDAV2.cpp
@@ -50,6 +50,12 @@ void frmNewAccount::RunCardDAV2Test( wxCommandEvent& event ){
 #if defined(__APPLE__)
 #elif defined(__WIN32__)
 
+		TestConnection.BypassSSLVerification(true);
+
+		COConnectResult TestConnectionResult = TestConnection.Connect(false);
+
+		TestConnection.BypassSSLVerification(false);
+
 		BOOL ModifiedCertificateData = false;
 
 		CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateDialogData = BuildCertificateData(&TestConnection, (HWND)this->GetHandle());
@@ -58,13 +64,14 @@ void frmNewAccount::RunCardDAV2Test( wxCommandEvent& event ){
 			wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog"));
 		}
 
-		if (ModifiedCertificateData = false){
+		if (ModifiedCertificateData == false){
 
 			lblServerConnResult->SetLabel(_("Failed"));
 			lblServerResponse->SetLabel(_("Not applicable"));
 			lblServerSSLResult->SetLabel(_("Used"));
 			lblServerSSLValid->SetLabel(_("No"));
 			lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + TestConnection.GetErrorMessage());
+			btnPrevious->Enable(true);
 			return;
 
 		}
@@ -118,6 +125,8 @@ void frmNewAccount::RunCardDAV2Test( wxCommandEvent& event ){
 #endif
 	}
 	
+	TestConnectionResult = TestConnection.Connect(true);
+
 	// Get the server prefix if the connection was successful.
 	
 	if (TestConnectionResult == COCONNECT_OK){