X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorNotes.cpp;h=b2b6983848b1e59d7450f92d7c1cdbe2ebc8cfcc;hb=ab3dee2bcfd41def158d2cec95e2dcdac376b81c;hp=0dbfb7863b59c59aa3e8de1abf6bfda3aeba0896;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorNotes.cpp b/source/contacteditor/frmContactEditorNotes.cpp
index 0dbfb78..b2b6983 100644
--- a/source/contacteditor/frmContactEditorNotes.cpp
+++ b/source/contacteditor/frmContactEditorNotes.cpp
@@ -24,21 +24,31 @@ frmContactEditorNotes::frmContactEditorNotes( wxWindow* parent )
 :
 frmContactEditorNotesADT( parent )
 {
+	
+	// Setup the editor window.
+	
 	EditorMode = FALSE;
 	sliPriority->Disable();
 }
 
 void frmContactEditorNotes::EnablePriority( wxCommandEvent& event )
 {
+	
+	// Enable/disable the priority setting.
+	
 	if (chkUsePref->IsChecked()){
 		sliPriority->Enable();
 	} else {
 		sliPriority->Disable();
 	}
+	
 }
 
 void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
 {
+	
+	// Process action.
+	
 	long ListCtrlIndex;
 	
 	if (EditorMode == FALSE){
@@ -184,6 +194,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -220,7 +233,8 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		striter = NotesListLangPtr->find(NotesListIndex);
 		
-		if (striter->first == NotesListIndex){
+		if (striter->first == NotesListIndex &&
+			striter != NotesListLangPtr->end()){
 		
 			strValue = striter->second;
 		
@@ -232,7 +246,8 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		intiter = NotesListPrefPtr->find(NotesListIndex);
 		
-		if (intiter->first == NotesListIndex && intiter->second > 0){
+		if (intiter->first == NotesListIndex && intiter->second > 0 &&
+			intiter != NotesListPrefPtr->end()){
 		
 			sliPriority->SetValue(intiter->second);
 			sliPriority->Enable();
@@ -248,7 +263,11 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorNotes::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close the window.
+	
 	this->Close();
+	
 }
 
 
@@ -263,6 +282,8 @@ void frmContactEditorNotes::SetupPointers(std::map<int, wxString> *NotesList,
 	int NotesIndex )
 {
 
+	// Setup the pointers.
+	
 	NotesListPtr = NotesList;
 	NotesListLangPtr = NotesListLang;
 	NotesListAltIDPtr = NotesListAltID;