Merge commits from upstream

[xestiaab/.git] / source / frmMain.cpp

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index fad8469..6625432 100644 (file)
--- 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);