X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorNickname.cpp;h=c0ecc2f7c61285d4016f23a1cb2368b706a7bc9f;hb=c139f797277a0cd85fe9f0b6b8244b791e0cf9ab;hp=62937afa498f4596f5dbe4098f9a5251b60e5e94;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorNickname.cpp b/source/contacteditor/frmContactEditorNickname.cpp
index 62937af..c0ecc2f 100644
--- a/source/contacteditor/frmContactEditorNickname.cpp
+++ b/source/contacteditor/frmContactEditorNickname.cpp
@@ -198,7 +198,8 @@ void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType
 		
 		striter = NicknamesListLanguagePtr->find(NicknamesListIndex);
 		 
-		if (striter->first == NicknamesListIndex){
+		if (striter->first == NicknamesListIndex &&
+			striter != NicknamesListLanguagePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -211,7 +212,8 @@ void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType
 		
 		intiter = NicknamesListPrefPtr->find(NicknamesListIndex);
 		
-		if (intiter->first == NicknamesListIndex && intiter->second > 0){
+		if (intiter->first == NicknamesListIndex && intiter->second > 0 &&
+			intiter != NicknamesListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();