From 49daaa0014c2af71cec36ba1cd643255726727f4 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 10 Jan 2016 22:44:30 +0000
Subject: [PATCH] Added check for Address List Label map pointer.

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

diff --git a/source/contacteditor/frmContactEditorAddress.cpp b/source/contacteditor/frmContactEditorAddress.cpp
index b20adeb..30c648b 100644
--- a/source/contacteditor/frmContactEditorAddress.cpp
+++ b/source/contacteditor/frmContactEditorAddress.cpp
@@ -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();
+			}
 		
 		}
 
-- 
2.39.2