frmContactEditor: Stop XAB crashing when pressing Modify/Delete

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

diff --git a/source/contacteditor/frmContactEditor-Other.cpp b/source/contacteditor/frmContactEditor-Other.cpp
index 4de1ddd..171b3ae 100644 (file)
--- a/source/contacteditor/frmContactEditor-Other.cpp
+++ b/source/contacteditor/frmContactEditor-Other.cpp
@@ -24,12 +24,9 @@ void frmContactEditor::AddVendorNamespace( wxCommandEvent& event )
 {
        
        // Bring up the window for adding vendor namespace data.
-       
-       int intResult = 0;
     
        frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
        frameCEVen->SetEditorMode(FALSE);
-       intResult = GetLastInt(&ContactEditorData.VendorList);
        frameCEVen->SetupPointers(&ContactEditorData.VendorList,
                &ContactEditorData.VendorListPEN,
                 &ContactEditorData.VendorListElement,
@@ -49,7 +46,7 @@ void frmContactEditor::ModifyVendorNamespace( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboVendorNamespace,
+       if (lboVendorNamespace->GetItemCount() == 0 || !GetSelectedItem(lboVendorNamespace,
                &longSelected,
                &intSelectedData)){
                return;
@@ -76,7 +73,7 @@ void frmContactEditor::DeleteVendorNamespace( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboVendorNamespace,
+       if (lboVendorNamespace->GetItemCount() == 0 || !GetSelectedItem(lboVendorNamespace,
                &longSelected,
                 &intSelectedData)){
                return;
@@ -93,12 +90,9 @@ void frmContactEditor::AddXToken( wxCommandEvent& event )
 {
        
        // Bring up the window for adding extended data.
-       
-       int intResult = 0;
-    
+           
        frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
        frameCEXT->SetEditorMode(FALSE);
-       intResult = GetLastInt(&ContactEditorData.XTokenList);
        frameCEXT->SetupPointers(&ContactEditorData.XTokenList,
                &ContactEditorData.XTokenListTokens,
                 lboXToken,
@@ -117,7 +111,7 @@ void frmContactEditor::ModifyXToken( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboXToken,
+       if (lboXToken->GetItemCount() == 0 || !GetSelectedItem(lboXToken,
        
                &longSelected,
                 &intSelectedData)){
@@ -145,7 +139,7 @@ void frmContactEditor::DeleteXToken( wxCommandEvent& event )
        long longSelected = -1;
        int intSelectedData = 0;
     
-       if (!GetSelectedItem(lboXToken,
+       if (lboXToken->GetItemCount() == 0 || !GetSelectedItem(lboXToken,
                &longSelected,
                 &intSelectedData)){
                return;