Fixed potential crash with frmContactEditorTelephone in Edit mode.

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

diff --git a/source/contacteditor/frmContactEditorPicture.cpp b/source/contacteditor/frmContactEditorPicture.cpp
index 9a72372..d6ffcc3 100644 (file)
--- a/source/contacteditor/frmContactEditorPicture.cpp
+++ b/source/contacteditor/frmContactEditorPicture.cpp
@@ -267,8 +267,7 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
                        return;
                }               
                
-               if (PictureLogo == TRUE){
-               
+               if (PictureLogo == TRUE){               
                        PictureListCtrlPtr->SetItem(longSelected, 0, _("Picture"));
                        
                } else {
@@ -326,7 +325,8 @@ void frmContactEditorPicture::SetEditorMode(bool EditMode)
                
                striter = PictureListTypePtr->find(PictureListIndex);
                 
-               if (striter->first == PictureListIndex){
+               if (striter->first == PictureListIndex &&
+                       striter != PictureListTypePtr->end()){
                
                        strValue = striter->second;
                
@@ -352,7 +352,8 @@ void frmContactEditorPicture::SetEditorMode(bool EditMode)
                
                intiter = PictureListPrefPtr->find(PictureListIndex);
                
-               if (intiter->first == PictureListIndex && intiter->second > 0){
+               if (intiter->first == PictureListIndex && intiter->second > 0 &&
+                       intiter != PictureListPrefPtr->end()){
                
                        sliPriority->SetValue(intiter->second);
                        sliPriority->Enable();