Fixed potential crash with frmContactEditorTelephone in Edit mode.

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

diff --git a/source/contacteditor/frmContactEditorTelephone.cpp b/source/contacteditor/frmContactEditorTelephone.cpp
index d6d8399..974151c 100644 (file)
--- a/source/contacteditor/frmContactEditorTelephone.cpp
+++ b/source/contacteditor/frmContactEditorTelephone.cpp
@@ -175,7 +175,9 @@ void frmContactEditorTelephone::ProcessAction( wxCommandEvent& event )
                
                }
                                
-               TelephoneListTypePtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));          
+               TelephoneListTypePtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));
+
+               TelephoneListTypeInfoPtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));
                
                // Add Telephone Priority.
                
@@ -351,6 +353,9 @@ void frmContactEditorTelephone::ProcessAction( wxCommandEvent& event )
                TelephoneListTypePtr->erase(TelephoneListIndex);
                TelephoneListTypePtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));          
                
+               TelephoneListTypeInfoPtr->erase(TelephoneListIndex);
+               TelephoneListTypeInfoPtr->insert(std::make_pair(TelephoneListIndex, strTelTypes));              
+               
                // Edit the Telephone Priority.
                
                TelephoneListPrefPtr->erase(TelephoneListIndex);
@@ -517,7 +522,8 @@ void frmContactEditorTelephone::SetEditorMode(bool EditMode, SectionType SectTyp
                
                intiter = TelephoneListPrefPtr->find(TelephoneListIndex);
                
-               if (intiter->first == TelephoneListIndex && intiter->second > 0){
+               if (intiter->first == TelephoneListIndex && intiter->second > 0 &&
+                       intiter != TelephoneListPrefPtr->end()){
                
                        sliPriority->SetValue(intiter->second);
                        sliPriority->Enable();