frmContactEditor: Stop XAB crashing when pressing Modify/Delete

[xestiaab/.git] / source / contacteditor / frmContactEditorVendor.cpp

diff --git a/source/contacteditor/frmContactEditorVendor.cpp b/source/contacteditor/frmContactEditorVendor.cpp
index 4696a9d..2ca399b 100644 (file)
--- a/source/contacteditor/frmContactEditorVendor.cpp
+++ b/source/contacteditor/frmContactEditorVendor.cpp
@@ -29,6 +29,7 @@ frmContactEditorVendorADT( parent )
 
 void frmContactEditorVendor::SetEditorMode(bool EditMode)
 {
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -67,7 +68,8 @@ void frmContactEditorVendor::SetEditorMode(bool EditMode)
 
                striter = VendorListElementPtr->find(VendorListIndex);
                 
-               if (striter->first == VendorListIndex){
+               if (striter->first == VendorListIndex &&
+                       striter != VendorListElementPtr->end()){
                
                        strValue = striter->second;
                
@@ -81,7 +83,8 @@ void frmContactEditorVendor::SetEditorMode(bool EditMode)
                
                striter = VendorListPtr->find(VendorListIndex);
                 
-               if (striter->first == VendorListIndex){
+               if (striter->first == VendorListIndex &&
+                       striter != VendorListPtr->end()){
                
                        strValue = striter->second;
                
@@ -98,6 +101,8 @@ void frmContactEditorVendor::SetEditorMode(bool EditMode)
 void frmContactEditorVendor::ProcessAction( wxCommandEvent& event )
 {
        
+       // Process action.
+       
        if (EditorMode == FALSE){
 
                wxString strValue;
@@ -180,7 +185,8 @@ void frmContactEditorVendor::SetupPointers( std::map<int, wxString> *VendorList,
                        wxListCtrl *VendorListCtrl,
                        int VendorIndex )
 {
-
+       // Setup the pointers.
+       
        VendorListPtr = VendorList;
        VendorListPENPtr = VendorListPEN;
        VendorListElementPtr = VendorListElement;
@@ -191,5 +197,9 @@ void frmContactEditorVendor::SetupPointers( std::map<int, wxString> *VendorList,
 
 void frmContactEditorVendor::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close the window.
+       
        this->Close();
+       
 }