X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fforms%2Fmain%2FfrmMain.cpp;h=8d6a4f8a86d49ec0e8fcd195110bda6d0caa312c;hp=835118bde12f1b481842290e82c533e867245c9e;hb=cc5af07fed91fda6b067780c62d545ba48740c64;hpb=616ddd1b189837e5a7d1d6953534115be44f477b

diff --git a/source/forms/main/frmMain.cpp b/source/forms/main/frmMain.cpp
index 835118b..8d6a4f8 100644
--- a/source/forms/main/frmMain.cpp
+++ b/source/forms/main/frmMain.cpp
@@ -258,6 +258,13 @@ void frmMain::LoadAccountData(){
 void frmMain::ShowPreferencesWindow( wxCommandEvent& event )
 {
 
+	// Close all windows first.
+	
+	if (CloseAllWindows() == false)
+	{
+		return;
+	}
+	
 	// Open the preferences window.
     
 	reloadAccounts = FALSE;
@@ -378,6 +385,13 @@ void frmMain::CreateNewCalendar( wxCommandEvent& event )
 void frmMain::EditCalendar( wxCommandEvent& event )
 {
 	
+	// Close all windows first.
+	
+	if (CloseAllWindows() == false)
+	{
+		return;
+	}
+	
 	// Get the calendar data.
 	
 	CDSGetCalendarInfo calendarInfo = calendarData.GetCalendar(event.GetInt());
@@ -395,6 +409,13 @@ void frmMain::EditCalendar( wxCommandEvent& event )
 void frmMain::DeleteCalendar( wxCommandEvent& event )
 {
 
+	// Close all windows first.
+	
+	if (CloseAllWindows() == false)
+	{
+		return;
+	}
+	
 	CalendarProperties *calendarEventInfo = (CalendarProperties*)event.GetClientData();
 	
 	// Get the calendar data.