Fixed potential crash with frmContactEditorTelephone in Edit mode.

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

diff --git a/source/contacteditor/frmContactEditorGroups.cpp b/source/contacteditor/frmContactEditorGroups.cpp
index 46a8253..094347f 100755 (executable)
--- a/source/contacteditor/frmContactEditorGroups.cpp
+++ b/source/contacteditor/frmContactEditorGroups.cpp
@@ -1,8 +1,27 @@
+// frmContactEditorGroups.cpp - frmContactEditorGroups form.\r
+//\r
+// (c) 2012-2015 Xestia Software Development.\r
+//\r
+// This file is part of Xestia Address Book.\r
+//\r
+// Xestia Address Book is free software: you can redistribute it and/or modify\r
+// it under the terms of the GNU General Public License as published by the\r
+// Free Software Foundation, version 3 of the license.\r
+//\r
+// Xestia Address Book is distributed in the hope that it will be useful,\r
+// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+// GNU General Public License for more details.\r
+//\r
+// You should have received a copy of the GNU General Public License along\r
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>\r
+\r
 #include "frmContactEditorGroups.h"\r
 #include <wx/wx.h>\r
 #include <wx/dir.h>\r
 #include "../vcard/vcard.h"\r
 #include "../common/dirs.h"\r
+#include "../frmMain.h"\r
 \r
 frmContactEditorGroup::frmContactEditorGroup( wxWindow* parent )\r
 :\r
@@ -150,18 +169,18 @@ void frmContactEditorGroup::FetchContacts( wxInitDialogEvent& event )
                \r
     } else {\r
                \r
-       ContactIndex = vCardNamesDsc.size() - 1;\r
+        ContactIndex = (int)(vCardNamesDsc.size() - 1);\r
                \r
-        for (std::map<wxString,ContactData>::iterator iter = vCardNamesDsc.begin(); \r
-       iter != vCardNamesDsc.end(); ++iter){\r
+        for (std::map<wxString,ContactData>::iterator iter = vCardNamesDsc.begin();\r
+             iter != vCardNamesDsc.end(); ++iter){\r
 \r
-          chkContacts->InsertItems(1, &iter->first, 0);\r
+            chkContacts->InsertItems(1, &iter->first, 0);\r
 \r
-          ContactNamesData.insert(std::make_pair(ContactIndex, iter->second));         \r
-       \r
-          ContactIndex--;\r
+            ContactNamesData.insert(std::make_pair(ContactIndex, iter->second));\r
+        \r
+            ContactIndex--;\r
 \r
-       }\r
+        }\r
        \r
     }\r
 \r
@@ -192,8 +211,6 @@ void frmContactEditorGroup::ProcessData( wxCommandEvent& event )
                        \r
                        }\r
                        \r
-                       std::map<int, ContactData>::iterator CDataIter = ContactNamesData.find(i);\r
-                       \r
                        wxListItem ItemData;\r
                        ItemData.SetId(0);\r
                        ItemData.SetText(chkContacts->GetString(i));\r