X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Load.cpp;h=92990a933a5eae79ae1eef37cfcf093193c12301;hb=96a36fb1c4c7e04b5bf17cf07f63f2792d23f067;hp=90fff1c548d6aad44ed4d833401ffa2e2a3e9980;hpb=411cb217958a492b2449f90de64a99650e5b1e9e;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 90fff1c..92990a9 100644
--- 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).
 	
-	LoadData(&ContactEditorData.GeneralIMList,
+	LoadData(&ContactEditorData.GeneralIMListTypeInfo,
 		&ContactEditorData.GeneralIMListPref,
-		&ContactEditorData.GeneralIMListTypeInfo,
+		&ContactEditorData.GeneralIMList,
 		lboIM,
-		&ContactEditorData.HomeIMList,
-		&ContactEditorData.HomeIMListPref,
 		&ContactEditorData.HomeIMListTypeInfo,
+		&ContactEditorData.HomeIMListPref,
+		&ContactEditorData.HomeIMList,
 		lboHomeIM,
-		&ContactEditorData.BusinessIMList,
-		&ContactEditorData.BusinessIMListPref,
 		&ContactEditorData.BusinessIMListTypeInfo,
+		&ContactEditorData.BusinessIMListPref,
+		&ContactEditorData.BusinessIMList,
 		lboBusinessIM,
 		&IMPPCount);
 
@@ -1541,6 +1541,10 @@ void frmContactEditor::LoadKind(ContactKindType *KindType){
 
 void frmContactEditor::LoadBirthday(wxString *BirthdayData, bool *BirthdayText){
 
+	if (BirthdayData->IsEmpty()){
+	    return;
+	}
+  
 	if (*BirthdayText == FALSE){
 	
 		int DateYear = 0;
@@ -1576,6 +1580,10 @@ void frmContactEditor::LoadBirthday(wxString *BirthdayData, bool *BirthdayText){
 
 void frmContactEditor::LoadAnniversary(wxString *AnniversaryData, bool *AnniversaryText){
 
+  	if (AnniversaryData->IsEmpty()){
+	    return;
+	}
+  
 	if (*AnniversaryText == FALSE){
 	
 		int DateYear = 0;