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
Added XML conversion to ConvertToV3.
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditor-Load.cpp
diff --git
a/source/contacteditor/frmContactEditor-Load.cpp
b/source/contacteditor/frmContactEditor-Load.cpp
index
90fff1c
..
92990a9
100644
(file)
--- a/
source/contacteditor/frmContactEditor-Load.cpp
+++ b/
source/contacteditor/frmContactEditor-Load.cpp
@@
-374,17
+374,17
@@
bool frmContactEditor::LoadContact(wxString Filename){
// Process the instant messaging (IMPP).
// Process the instant messaging (IMPP).
- LoadData(&ContactEditorData.GeneralIMList,
+ LoadData(&ContactEditorData.GeneralIMList
TypeInfo
,
&ContactEditorData.GeneralIMListPref,
&ContactEditorData.GeneralIMListPref,
- &ContactEditorData.GeneralIMList
TypeInfo
,
+ &ContactEditorData.GeneralIMList,
lboIM,
lboIM,
- &ContactEditorData.HomeIMList,
- &ContactEditorData.HomeIMListPref,
&ContactEditorData.HomeIMListTypeInfo,
&ContactEditorData.HomeIMListTypeInfo,
+ &ContactEditorData.HomeIMListPref,
+ &ContactEditorData.HomeIMList,
lboHomeIM,
lboHomeIM,
- &ContactEditorData.BusinessIMList,
- &ContactEditorData.BusinessIMListPref,
&ContactEditorData.BusinessIMListTypeInfo,
&ContactEditorData.BusinessIMListTypeInfo,
+ &ContactEditorData.BusinessIMListPref,
+ &ContactEditorData.BusinessIMList,
lboBusinessIM,
&IMPPCount);
lboBusinessIM,
&IMPPCount);
@@
-1541,6
+1541,10
@@
void frmContactEditor::LoadKind(ContactKindType *KindType){
void frmContactEditor::LoadBirthday(wxString *BirthdayData, bool *BirthdayText){
void frmContactEditor::LoadBirthday(wxString *BirthdayData, bool *BirthdayText){
+ if (BirthdayData->IsEmpty()){
+ return;
+ }
+
if (*BirthdayText == FALSE){
int DateYear = 0;
if (*BirthdayText == FALSE){
int DateYear = 0;
@@
-1576,6
+1580,10
@@
void frmContactEditor::LoadBirthday(wxString *BirthdayData, bool *BirthdayText){
void frmContactEditor::LoadAnniversary(wxString *AnniversaryData, bool *AnniversaryText){
void frmContactEditor::LoadAnniversary(wxString *AnniversaryData, bool *AnniversaryText){
+ if (AnniversaryData->IsEmpty()){
+ return;
+ }
+
if (*AnniversaryText == FALSE){
int DateYear = 0;
if (*AnniversaryText == FALSE){
int DateYear = 0;
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy