Fixed potential crash in frmContactEditorCalAdr in Edit mode.

[xestiaab/.git] / source / contacteditor / frmContactEditorCalAdr.cpp

diff --git a/source/contacteditor/frmContactEditorCalAdr.cpp b/source/contacteditor/frmContactEditorCalAdr.cpp
index 7865799..29da66e 100644 (file)
--- a/source/contacteditor/frmContactEditorCalAdr.cpp
+++ b/source/contacteditor/frmContactEditorCalAdr.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorCalAdr.cpp - frmContactEditorCalAdr 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 "frmContactEditorCalAdr.h"
 #include <wx/tokenzr.h>
 #include "../common/textprocessing.h"
@@ -195,7 +213,8 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
                
                striter = CalAdrListTypePtr->find(CalAdrListIndex);     
                
-               if (striter->first == CalAdrListIndex){
+               if (striter->first == CalAdrListIndex && 
+                       striter != CalAdrListTypePtr->end()){
                
                        strValue = striter->second;
                
@@ -219,7 +238,8 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
                
                intiter = CalAdrListPrefPtr->find(CalAdrListIndex);
                
-               if (intiter->first == CalAdrListIndex && intiter->second > 0){
+               if (intiter->first == CalAdrListIndex && intiter->second > 0 &&
+                       intiter != CalAdrListPrefPtr->end()){
                
                        sliPriority->SetValue(intiter->second);
                        sliPriority->Enable();