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 29da821..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);
@@ -439,13 +444,19 @@ void frmContactEditorTelephone::SetEditorMode(bool EditMode, SectionType SectTyp
                
                // Get the phone types in.
                
-               striter = TelephoneListTypePtr->find(TelephoneListIndex);
+               
+               if (TelephoneListTypeInfoPtr->find(TelephoneListIndex) !=
+                       TelephoneListTypeInfoPtr->end()){
+               
+                       striter = TelephoneListTypeInfoPtr->find(TelephoneListIndex);
                 
-               if (striter->first == TelephoneListIndex){
+                       if (striter->first == TelephoneListIndex){
                
-                       strValue = striter->second;
+                               strValue = striter->second;
                
-               }               
+                       }       
+               
+               }       
                
                wxStringTokenizer TelephonePrefToken (strValue, wxT(","));
                
@@ -511,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();
@@ -529,6 +541,7 @@ void frmContactEditorTelephone::SetupPointers(std::map<int, wxString> *Telephone
        std::map<int, wxString> *TelephoneListAltID,
        std::map<int, wxString> *TelephoneListPID,
        std::map<int, wxString> *TelephoneListType,
+       std::map<int, wxString> *TelephoneListTypeInfo,
        std::map<int, wxString> *TelephoneListTokens,
        std::map<int, int> *TelephoneListPref,
        wxListCtrl *TelephoneListCtrl,
@@ -539,6 +552,7 @@ void frmContactEditorTelephone::SetupPointers(std::map<int, wxString> *Telephone
        TelephoneListAltIDPtr = TelephoneListAltID;
        TelephoneListPIDPtr = TelephoneListPID;
        TelephoneListTypePtr = TelephoneListType;
+       TelephoneListTypeInfoPtr = TelephoneListTypeInfo;
        TelephoneListTokensPtr = TelephoneListTokens;
        TelephoneListPrefPtr = TelephoneListPref;
        TelephoneListCtrlPtr = TelephoneListCtrl;