From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Fri, 12 Jan 2018 00:10:08 +0000 (+0000)
Subject: frmContactEditor: Check for parent window before sending update event
X-Git-Tag: release-0.22~8
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=0275a73f31efad4ca385a93be173b2cc6921d18d;hp=2031be04c0036b44c40c473a07fdd31e898b2a11

frmContactEditor: Check for parent window before sending update event
---

diff --git a/source/contacteditor/frmContactEditor-Save.cpp b/source/contacteditor/frmContactEditor-Save.cpp
index 2073e67..9018943 100644
--- a/source/contacteditor/frmContactEditor-Save.cpp
+++ b/source/contacteditor/frmContactEditor-Save.cpp
@@ -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 )