frmContactEditor: Stop crashing when pressing Modify/Delete buttons when there's...

[xestiaab/.git] / source / contacteditor / frmContactEditor-Calendar.cpp

diff --git a/source/contacteditor/frmContactEditor-Calendar.cpp b/source/contacteditor/frmContactEditor-Calendar.cpp
index e4b8135..083dc80 100644 (file)
--- a/source/contacteditor/frmContactEditor-Calendar.cpp
+++ b/source/contacteditor/frmContactEditor-Calendar.cpp
@@ -48,7 +48,7 @@ void frmContactEditor::ModifyCalendarAddress( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboCalendarAddresses,
+       if (lboCalendarAddresses->GetItemCount() == 0 || !GetSelectedItem(lboCalendarAddresses,
                &longSelected,
                &intSelectedData)){
                
@@ -80,7 +80,7 @@ void frmContactEditor::DeleteCalendarAddress( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboCalendarAddresses,
+       if (lboCalendarAddresses->GetItemCount() == 0 || !GetSelectedItem(lboCalendarAddresses,
                &longSelected,
                &intSelectedData)){
                
@@ -125,7 +125,7 @@ void frmContactEditor::ModifyCalendarRequest( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboCalendarRequestAddress,
+       if (lboCalendarRequestAddress->GetItemCount() == 0 || !GetSelectedItem(lboCalendarRequestAddress,
                &longSelected,
                &intSelectedData)){
                
@@ -157,7 +157,7 @@ void frmContactEditor::DeleteCalendarRequest( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboCalendarRequestAddress,
+       if (lboCalendarRequestAddress->GetItemCount() == 0 || !GetSelectedItem(lboCalendarRequestAddress,
                &longSelected,
                &intSelectedData)){
                
@@ -203,7 +203,7 @@ void frmContactEditor::ModifyFreeBusy( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboFreeBusyAddresses,
+       if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses,
                &longSelected,
                &intSelectedData)){
                
@@ -235,7 +235,7 @@ void frmContactEditor::DeleteFreeBusy( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboFreeBusyAddresses,
+       if (lboFreeBusyAddresses->GetItemCount() == 0 || !GetSelectedItem(lboFreeBusyAddresses,
                &longSelected,
                &intSelectedData)){