From 1759400884dfefa8bba80c2cef27aa8ee2d05c2c Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 28 Dec 2015 03:50:27 +0000
Subject: [PATCH] Replaced string processing in XML with ProcessStringValue.

---
 source/contacteditor/ContactDataObject.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/contacteditor/ContactDataObject.cpp b/source/contacteditor/ContactDataObject.cpp
index 4c2cbc6..47fe119 100644
--- a/source/contacteditor/ContactDataObject.cpp
+++ b/source/contacteditor/ContactDataObject.cpp
@@ -680,6 +680,7 @@ void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2,
 	wxString PropertyTokens;
 	std::map<int,int>::iterator SLiter;
 	bool FirstToken = TRUE;
+	bool PropertyMatched = FALSE;
 	
 	for (std::map<int, int>::iterator intiter = SplitPoints.begin(); 
 	intiter != SplitPoints.end(); ++intiter){
@@ -696,10 +697,12 @@ void ContactDataObject::ProcessXML(wxString PropertySeg1, wxString PropertySeg2,
 		
 		CaptureString(&PropertyValue, FALSE);
 	
-		if (PropertyName == wxT("ALTID")){
-
-			XMLListAltID.erase(*XMLCount);
-			XMLListAltID.insert(std::make_pair(*XMLCount, PropertyValue));
+		ProcessStringValue(&PropertyName, "ALTID", &XMLListAltID, &PropertyValue, XMLCount, &PropertyMatched);
+		
+		if (PropertyMatched == TRUE){
+		
+			PropertyMatched = FALSE;
+			continue;
 		
 		}
 		
-- 
2.39.5