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
frmContactEditor: Stop crashing when pressing Modify/Delete buttons when there's...
[xestiaab/.git]
/
source
/
frmConflictResolution.cpp
diff --git
a/source/frmConflictResolution.cpp
b/source/frmConflictResolution.cpp
index
d5c0a3f
..
1779161
100644
(file)
--- a/
source/frmConflictResolution.cpp
+++ b/
source/frmConflictResolution.cpp
@@
-64,7
+64,7
@@
int frmConflictResolution::GetResult(){
}
}
-void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map<wxString, wxString> *MemoryFSList){
+void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map<wxString, wxString> *MemoryFSList
, wxString backgroundColour
){
// Load the local data.
// Load the local data.
@@
-72,11
+72,11
@@
void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::m
wxString ServerSID = wxString::Format(wxT("%i"), rand() % 32768);
LoadContactData(LocalData, htmClient, ClientSID,
wxString ServerSID = wxString::Format(wxT("%i"), rand() % 32768);
LoadContactData(LocalData, htmClient, ClientSID,
- wxT(""), MemoryFSList);
+ wxT(""), MemoryFSList
, backgroundColour
);
// Load the server data.
LoadContactData(ServerData, htmServer, ServerSID,
// Load the server data.
LoadContactData(ServerData, htmServer, ServerSID,
- wxT(""), MemoryFSList
);
+ wxT(""), MemoryFSList
, backgroundColour);
}
\ No newline at end of file
}
\ No newline at end of file
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy