X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorPicture.cpp;h=d6ffcc3e497870625b9cd86535f7fda910ad4cc4;hb=bdb1cb146a16ae7f8e15aa9c9f084705a5249973;hp=9a723724ff3a8f426e23aec8ce38efb1e51db09b;hpb=77cdd6167df1f549e03d074166c7544a483bc89e;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorPicture.cpp b/source/contacteditor/frmContactEditorPicture.cpp
index 9a72372..d6ffcc3 100644
--- 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();