X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Save.cpp;h=901894323fb0f1323c71176bdb96723c75b9eb2b;hp=f00c73971f4436694cb0ccefb4ac03ecb4b34a8e;hb=0275a73f31efad4ca385a93be173b2cc6921d18d;hpb=c58983d98dc0bcaceef7bfd3421a7710f3bd8fc0

diff --git a/source/contacteditor/frmContactEditor-Save.cpp b/source/contacteditor/frmContactEditor-Save.cpp
index f00c739..9018943 100644
--- a/source/contacteditor/frmContactEditor-Save.cpp
+++ b/source/contacteditor/frmContactEditor-Save.cpp
@@ -345,7 +345,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
 			FinalAnniversaryMonth = wxString::Format(wxT("%i"), ((int)AnniversaryMonth + 1));
                 
 		}
-            
+        
 		if (AnniversaryYear == 0){
                 
 			FinalAnniversaryYear = wxT("--");
@@ -534,23 +534,26 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
 	NameData.Title = txtTitle->GetValue();
 	NameData.Suffix = txtSuffix->GetValue();
 	
-	ucd->ContactAccount = wxSContactAccount;
-	ucd->ContactFilename = FilenameFinal;
-	ucd->ContactName = cmbDisplayAs->GetValue();
-	ucd->ContactNameArray = NameData;
+	if (this->GetParent() != nullptr)
+	{
+		ucd->ContactAccount = wxSContactAccount;
+		ucd->ContactFilename = FilenameFinal;
+		ucd->ContactName = cmbDisplayAs->GetValue();
+		ucd->ContactNameArray = NameData;
     
-	for (std::map<int,wxString>::iterator gniter = ContactEditorData.GeneralNicknamesList.begin();
-		gniter != ContactEditorData.GeneralNicknamesList.end(); gniter++){
+		for (std::map<int,wxString>::iterator gniter = ContactEditorData.GeneralNicknamesList.begin();
+			gniter != ContactEditorData.GeneralNicknamesList.end(); gniter++){
         
-		ucd->ContactNickname = gniter->second;
-		break;
+			ucd->ContactNickname = gniter->second;
+			break;
         
+		}
+	
+		wxCommandEvent event2(CE_UPDATECONTACTLIST);
+		event2.SetClientData(ucd);
+		wxPostEvent(MainPtr, event2);
 	}
     
-	wxCommandEvent event2(CE_UPDATECONTACTLIST);
-	event2.SetClientData(ucd);
-	wxPostEvent(MainPtr, event2);
-    
 }
 
 void frmContactEditor::SaveCloseContact( wxCommandEvent& event )