X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fforms%2Feventeditor%2FfrmEventEditor.cpp;h=090f53f5e6ed9cc54f0e22846404faeecbb57f20;hp=dda8dd17ac2d4d872181169a3fdaac0ddf9f37f6;hb=3cc2a299a3ac40b99703cdafe6b156510ead4fb2;hpb=0efd41cdb657851e3a008aa7e3a7b9e46a62235d

diff --git a/source/forms/eventeditor/frmEventEditor.cpp b/source/forms/eventeditor/frmEventEditor.cpp
index dda8dd1..090f53f 100644
--- a/source/forms/eventeditor/frmEventEditor.cpp
+++ b/source/forms/eventeditor/frmEventEditor.cpp
@@ -159,7 +159,10 @@ void frmEventEditor::SaveContact(wxCommandEvent &event){
 
 void frmEventEditor::SaveNewContact(wxCommandEvent &event){
 	
-	SaveContact();
+	if (!SaveContact())
+	{
+		return;
+	}
 	
 	// Reset the form for a new entry.
 	
@@ -180,14 +183,14 @@ void frmEventEditor::SaveNewContact(wxCommandEvent &event){
 	
 }
 
-void frmEventEditor::SaveContact(){
+bool frmEventEditor::SaveContact(){
 
 	// Verify that a calendar has been selected.
 	
 	if (cmbCalendar->GetSelection() == -1 && editMode == false){
 		
 		wxMessageBox("Please select a calendar for this entry.", "No calendar selected", wxOK);
-		return;
+		return false;
 		
 	}
 	
@@ -196,7 +199,7 @@ void frmEventEditor::SaveContact(){
 	if (txtEventName->GetValue().IsEmpty()){
 		
 		wxMessageBox("The event name cannot be left empty.", "Event name is empty", wxOK);
-		return; 
+		return false;
 		
 	}
 	
@@ -357,6 +360,8 @@ void frmEventEditor::SaveContact(){
 		
 	}
 	
+	return true;
+	
 }
 
 void frmEventEditor::CloseWindow(wxCommandEvent &event)