Fixed source code formatting in CALURI for ConvertToV3

[xestiaab/.git] / source / contacteditor / frmContactEditorAddress.cpp

diff --git a/source/contacteditor/frmContactEditorAddress.cpp b/source/contacteditor/frmContactEditorAddress.cpp
index 30c648b..921ce48 100644 (file)
--- 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;