From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 14 May 2016 08:44:33 +0000 (+0100)
Subject: Moved actual fetching of server contact data until after verifying that the SSL conne... 
X-Git-Tag: release-0.13~29
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=3159f45b9111138301b288e6de30e158933cec88

Moved actual fetching of server contact data until after verifying that the SSL connection is okay.
---

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index 0314c8f..9bef583 100644
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -1013,13 +1013,6 @@ void frmActivityMgr::ProcessTasksThread()
 					std::map<wxString,FileSyncData> *SCListData = NULL;
 					
 					while (ExitLoop == FALSE){
-					
-						ServerContactList = ConnHandle.GetContactList(SyncTokenLoad.ToUTF8());
-						SSLCertCollection certcol = ConnHandle.GetCertificateData();
-				
-						// Create a pointer for the std::map<wxString,FileSyncData>.
-				
-						SCListData = &ServerContactList.ListData;
 				
 						// Check if any errors have occured whilst getting the data.
 				
@@ -1161,6 +1154,13 @@ void frmActivityMgr::ProcessTasksThread()
 				
 					bool ContinueProcess = AccDir.GetFirst(&AccDirFilename, wxEmptyString, wxDIR_DEFAULT);
 				
+					ServerContactList = ConnHandle.GetContactList(SyncTokenLoad.ToUTF8());
+					SSLCertCollection certcol = ConnHandle.GetCertificateData();
+
+					// Create a pointer for the std::map<wxString,FileSyncData>.
+
+					SCListData = &ServerContactList.ListData;
+
 					// Process the server data.
 
 					if (SCListData != NULL){