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

diff --git a/source/contacteditor/frmContactEditorAddress.cpp b/source/contacteditor/frmContactEditorAddress.cpp
index f746895..30c648b 100644
--- a/source/contacteditor/frmContactEditorAddress.cpp
+++ b/source/contacteditor/frmContactEditorAddress.cpp
@@ -433,7 +433,7 @@ void frmContactEditorAddress::SetEditorMode( bool EditMode, SectionType SectType
 		
 		intiter = AddressListPrefPtr->find(AddressListIndex);
 		
-		if (intiter->first == AddressListIndex && intiter->second > 0){
+		if (intiter->first == AddressListIndex && intiter->second > 0 && intiter != AddressListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -445,9 +445,13 @@ void frmContactEditorAddress::SetEditorMode( bool EditMode, SectionType SectType
 		
 		striter = AddressListLabelPtr->find(AddressListIndex);
 		 
-		if (striter->first == AddressListIndex){
+		if (striter->first == AddressListIndex && striter != AddressListLabelPtr->end()){
 		
 			strValue = striter->second;
+			if (strValue.Left(1) == "\"" && strValue.Right(1) == "\""){
+				strValue.erase(0, 1);
+				strValue.RemoveLast();
+			}
 		
 		}