X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor-Save.cpp;h=dca32d08358cdfe0065bdf2ceac7bbb26eff72cf;hp=baeeae54b926b44a9f4f7043910b7ae1192ca70b;hb=f17747e21a80b71447654462a60fca6baaf64a17;hpb=6b58952dd564656cb93211f78748bb4d03bca0e7

diff --git a/source/contacteditor/frmContactEditor-Save.cpp b/source/contacteditor/frmContactEditor-Save.cpp
index baeeae5..dca32d0 100644
--- a/source/contacteditor/frmContactEditor-Save.cpp
+++ b/source/contacteditor/frmContactEditor-Save.cpp
@@ -33,7 +33,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
 	
 	if (boolUnsupportedAccount == true){
 	
-		wxMessageBox(_("Cannot make changes to a contact from an unsupported account type."), _("Unsupported account"), wxICON_ERROR);		
+		wxMessageBox(_("Cannot make changes to a contact from an unsupported account type."), _("Unsupported account"), wxICON_ERROR);
+		saveSuccess = false;
 		return;
 		
 	}
@@ -46,6 +47,7 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
 	if (cmbDisplayAsValue.IsEmpty()){
         
 		wxMessageBox(_("Display As value cannot be left blank."), _("Display As value empty"), wxICON_ERROR);
+		saveSuccess = false;
 		return;
         
 	}
@@ -566,6 +568,8 @@ void frmContactEditor::SaveContact( wxCommandEvent& event )
 		event2.SetClientData(ucd);
 		wxPostEvent(MainPtr, event2);
 	}
+	
+	saveSuccess = true;	
     
 }
 
@@ -576,6 +580,9 @@ void frmContactEditor::SaveCloseContact( wxCommandEvent& event )
     
 	wxCommandEvent NullEvent;
 	this->SaveContact(NullEvent);
-	this->Close();
+	if (saveSuccess)
+	{
+		this->Close();
+	}
     
 }
\ No newline at end of file