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

diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp
index 3715411..e429db7 100644
--- a/source/contacteditor/frmContactEditorGeoposition.cpp
+++ b/source/contacteditor/frmContactEditorGeoposition.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorGeoposition.cpp - frmContactEditorGeoposition form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #include "frmContactEditorGeoposition.h"
 #include <map>
 #include "../common/textprocessing.h"
@@ -58,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();
@@ -192,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,
@@ -206,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;