X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=6625432c12fb96fb3bbc3f06bb5236c833657d03;hb=21e7394518e0ac66ee33c324a3f0482c85bd5328;hp=fad846918cf4cc67ab59b2d20011d08a6e44cd82;hpb=57d545b714d1d77e805af3749915c49338fea522;p=xestiaab%2F.git

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index fad8469..6625432 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -1399,6 +1399,19 @@ void frmMain::LoadPreferences(){
 		AccTmrPtr = NULL;
         
 	}
+
+#if defined(__WIN32__)
+
+	for (std::map<int, PCCERT_CONTEXT>::iterator CertificateIter = AccountCertificateData.begin();
+		CertificateIter != AccountCertificateData.end(); CertificateIter++){
+
+		CertFreeCertificateContext(CertificateIter->second);
+
+	}
+
+	AccountCertificateData.clear();
+
+#endif
     
 	AccountSyncTimers.clear();
         
@@ -2793,6 +2806,16 @@ void frmMain::SetupSSLStatus( int AccountID ){
                 
                 std::map<int,int>::iterator SSLResultIter = AccountSSLResult.find(AccountID);
                 
+		// Check if a result value has been set.
+
+		if (SSLResultIter == AccountSSLResult.end()){
+
+			imgSSLStatus->SetBitmap(*imgSSLWarning);
+			SSLToolTip->SetTip(wxT("Unable to determine SSL information for the '") + prefaccounts.GetAccountName(AccountID) + wxT("' account."));
+			return;
+
+		}
+
                 if (SSLResultIter->second == 1){
                         
                         imgSSLStatus->SetBitmap(*imgSSLWarning);