X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorAddress.cpp;h=921ce482b8566c831efaf5337f6b8126b907c335;hb=5f1ea077458c5df909d4fac85b5f786ff96dcc5e;hp=30c648bb191eab7689e5dda43567e3cbf74dadc3;hpb=49daaa0014c2af71cec36ba1cd643255726727f4;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorAddress.cpp b/source/contacteditor/frmContactEditorAddress.cpp
index 30c648b..921ce48 100644
--- a/source/contacteditor/frmContactEditorAddress.cpp
+++ b/source/contacteditor/frmContactEditorAddress.cpp
@@ -461,17 +461,17 @@ void frmContactEditorAddress::SetEditorMode( bool EditMode, SectionType SectType
 		
 		striter = AddressListLangPtr->find(AddressListIndex);
 		 
-		if (striter->first == AddressListIndex){
+		if (striter->first == AddressListIndex && striter != AddressListLangPtr->end()){
 		
 			strValue = striter->second;
-		
+
 		}	
 		
 		cmbLanguage->SetValue(strValue);
 		
 		striter = AddressListGeoPtr->find(AddressListIndex);
 		 
-		if (striter->first == AddressListIndex){
+		if (striter->first == AddressListIndex && striter != AddressListGeoPtr->end()){
 		
 			strValue = striter->second;
 		
@@ -481,7 +481,7 @@ void frmContactEditorAddress::SetEditorMode( bool EditMode, SectionType SectType
 		
 		striter = AddressListTimezonePtr->find(AddressListIndex);
 		 
-		if (striter->first == AddressListIndex){
+		if (striter->first == AddressListIndex && striter != AddressListTimezonePtr->end()){
 		
 			strValue = striter->second;