// Add the label to the list (maps).
- AddressListLabelPtr->insert(std::make_pair(AddressListIndex, txtLabel->GetValue()));
+ wxString LabelData = txtLabel->GetValue();
+ LabelData.Prepend("\"");
+ LabelData.Append("\"");
+ AddressListLabelPtr->insert(std::make_pair(AddressListIndex, LabelData));
// Add the language to the list (maps).
// Add the label to the list (maps).
AddressListLabelPtr->erase(AddressListIndex);
- AddressListLabelPtr->insert(std::make_pair(AddressListIndex, txtLabel->GetValue()));
+
+ wxString LabelData = txtLabel->GetValue();
+ LabelData.Prepend("\"");
+ LabelData.Append("\"");
+ AddressListLabelPtr->insert(std::make_pair(AddressListIndex, LabelData));
// Add the language to the list (maps).
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();
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();
+ }
}
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;
striter = AddressListTimezonePtr->find(AddressListIndex);
- if (striter->first == AddressListIndex){
+ if (striter->first == AddressListIndex && striter != AddressListTimezonePtr->end()){
strValue = striter->second;