X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorTitles.cpp;h=8f9b6bc879b3b01514f091258d17084b5367f6c9;hb=4dab38868aa89e14497263a9ac0d6f737151cc09;hp=497c28ea415a137ab38c70ee8ab0c99b7a505535;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorTitles.cpp b/source/contacteditor/frmContactEditorTitles.cpp
index 497c28e..8f9b6bc 100644
--- a/source/contacteditor/frmContactEditorTitles.cpp
+++ b/source/contacteditor/frmContactEditorTitles.cpp
@@ -26,21 +26,31 @@ frmContactEditorTitles::frmContactEditorTitles( wxWindow* parent )
 :
 frmContactEditorTitlesADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
 	sliPriority->Disable();
 }
 
 void frmContactEditorTitles::EnablePriority( wxCommandEvent& event )
 {
+	
+	// Enable/disable the priority setting.
+	
 	if (chkUsePref->IsChecked()){
 		sliPriority->Enable();
 	} else {
 		sliPriority->Disable();
 	}
+	
 }
 
 void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 {
+	
+	// Process action.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -151,6 +161,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -175,7 +188,8 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		striter = TitlesListPtr->find(TitlesListIndex);
 		 
-		if (striter->first == TitlesListIndex){
+		if (striter->first == TitlesListIndex &&
+			striter != TitlesListPtr->end()){
 		
 			strValue = striter->second;
 		
@@ -189,7 +203,8 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		intiter = TitlesListPrefPtr->find(TitlesListIndex);
 		
-		if (intiter->first == TitlesListIndex && intiter->second > 0){
+		if (intiter->first == TitlesListIndex && intiter->second > 0 &&
+			intiter != TitlesListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -205,7 +220,11 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorTitles::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close the window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorTitles::SetupPointers(std::map<int, wxString> *TitlesList,
@@ -219,6 +238,8 @@ void frmContactEditorTitles::SetupPointers(std::map<int, wxString> *TitlesList,
 	int TitlesIndex )
 {
 
+	// Setup the pointers.
+	
 	TitlesListPtr = TitlesList;
 	TitlesListLanguagePtr = TitlesListLanguage;
 	TitlesListAltIDPtr = TitlesListAltID;