Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved actual fetching of server contact data until after verifying that the SSL conne...
[xestiaab/.git]
/
source
/
actmgr
/
frmActivityMgr.cpp
diff --git
a/source/actmgr/frmActivityMgr.cpp
b/source/actmgr/frmActivityMgr.cpp
index
0314c8f
..
9bef583
100644
(file)
--- 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){
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.
// 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);
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){
// Process the server data.
if (SCListData != NULL){
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy