X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorGeoposition.cpp;h=e429db716fbc245f80fe3d89b3f00c53dcea0a66;hb=c139f797277a0cd85fe9f0b6b8244b791e0cf9ab;hp=d16f8a0f79ba2b3b52a8b672c0c8ae574c2c179e;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp
index d16f8a0..e429db7 100644
--- a/source/contacteditor/frmContactEditorGeoposition.cpp
+++ b/source/contacteditor/frmContactEditorGeoposition.cpp
@@ -76,7 +76,8 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT
 		
 		intiter = GeopositionListPrefPtr->find(GeopositionListIndex);
 		
-		if (intiter->first == GeopositionListIndex && intiter->second > 0){
+		if (intiter->first == GeopositionListIndex && intiter->second > 0 &&
+			intiter != GeopositionListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -210,6 +211,7 @@ void frmContactEditorGeoposition::SetupPointers(std::map<int, wxString> *Geoposi
 	std::map<int, wxString> *GeopositionListAltID,
 	std::map<int, wxString> *GeopositionListPID,
 	std::map<int, wxString> *GeopositionListType,
+	std::map<int, wxString> *GeopositionListDataType,
 	std::map<int, wxString> *GeopositionListTokens,
 	std::map<int, wxString> *GeopositionListMediatype,	
 	std::map<int, int> *GeopositionListPref,
@@ -224,6 +226,7 @@ void frmContactEditorGeoposition::SetupPointers(std::map<int, wxString> *Geoposi
 	GeopositionListAltIDPtr = GeopositionListAltID;
 	GeopositionListPIDPtr = GeopositionListPID;
 	GeopositionListTypePtr = GeopositionListType;
+	GeopositionListDataTypePtr = GeopositionListDataType;
 	GeopositionListTokensPtr = GeopositionListTokens;
 	GeopositionListPrefPtr = GeopositionListPref;
 	GeopositionListCtrlPtr = GeopositionListCtrl;