X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorXToken.cpp;h=1e12de91194931b27cc4677def173ff0ffb53fcd;hb=b3c6e1e0d266bddfff1b817633edc77c1c6109f6;hp=e323fa57c25da88adda45e10da335848589213e8;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorXToken.cpp b/source/contacteditor/frmContactEditorXToken.cpp
index e323fa5..1e12de9 100644
--- a/source/contacteditor/frmContactEditorXToken.cpp
+++ b/source/contacteditor/frmContactEditorXToken.cpp
@@ -118,7 +118,8 @@ void frmContactEditorXToken::SetEditorMode(bool EditMode)
 		
 		striter = XTokenListTokensPtr->find(XTokenListIndex);
 		 
-		if (striter->first == XTokenListIndex){
+		if (striter->first == XTokenListIndex &&
+			striter != XTokenListTokensPtr->end()){
 		
 			strValue = striter->second;
 		
@@ -132,7 +133,8 @@ void frmContactEditorXToken::SetEditorMode(bool EditMode)
 
 		striter = XTokenListPtr->find(XTokenListIndex);
 		 
-		if (striter->first == XTokenListIndex){
+		if (striter->first == XTokenListIndex &&
+			striter != XTokenListPtr->end()){
 		
 			strValue = striter->second;