From c6ccf99af72092905b595cbd53613f8c06849a35 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 10 Jan 2016 23:27:15 +0000
Subject: [PATCH] Added check for address list geographic and language for
 frmContactEdiotrAddress

---
 source/contacteditor/frmContactEditorAddress.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/contacteditor/frmContactEditorAddress.cpp b/source/contacteditor/frmContactEditorAddress.cpp
index 30c648b..bc1b44c 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;
 		
-- 
2.39.5