frmContactEditor: Stop XAB crashing when pressing Modify/Delete

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

diff --git a/source/contacteditor/frmContactEditorGroups.cpp b/source/contacteditor/frmContactEditorGroups.cpp
index 0016987..01cd500 100755 (executable)
--- a/source/contacteditor/frmContactEditorGroups.cpp
+++ b/source/contacteditor/frmContactEditorGroups.cpp
@@ -27,6 +27,9 @@ frmContactEditorGroup::frmContactEditorGroup( wxWindow* parent )
 :\r
 frmContactEditorGroupsADT( parent )\r
 {\r
+       \r
+       // Setup the window.\r
+       \r
        EditorMode = FALSE;\r
 }\r
 \r
@@ -39,14 +42,11 @@ void frmContactEditorGroup::FetchContacts( wxInitDialogEvent& event )
        \r
        wxString AccountDirFinal = GetAccountDir(AccName, FALSE);\r
 \r
-       //wxString vcardfilenamewxs;\r
        wxString vCardFilename;\r
        wxString vCardFilenameFull;\r
        wxString vCardDataString;\r
-       //wxStringTokenizer vcardfileline;\r
        wxString lwxs;\r
        wxString setname, setvalue;\r
-       //vCardNames = new std::map<wxString, wxString, std::greater<wxString>>;\r
        std::multimap<wxString, ContactData, std::greater<wxString>> vCardNamesAsc;\r
        std::multimap<wxString, ContactData, std::less<wxString>> vCardNamesDsc;\r
        int ContactIndex = 0;\r
@@ -92,9 +92,6 @@ void frmContactEditorGroup::FetchContacts( wxInitDialogEvent& event )
                                PersonData.ContactName = PersonName;\r
                                PersonData.ContactUID = PersonUID;\r
                                PersonData.ContactFilename = PersonFilename;\r
-               \r
-                               //ContactsNames.insert(std::make_pair(PersonName, ContactIndex));\r
-                               //ContactsUIDs.insert(std::make_pair(ContactIndex, PersonUID));\r
        \r
                                if (XVMData.SortMode == 1){\r
 \r
@@ -191,6 +188,8 @@ void frmContactEditorGroup::FetchContacts( wxInitDialogEvent& event )
 void frmContactEditorGroup::ProcessData( wxCommandEvent& event )\r
 {\r
        \r
+       // Process action.\r
+       \r
        for (int i = 0; i < chkContacts->GetCount(); i++){\r
        \r
                if (chkContacts->IsChecked(i) == TRUE){\r
@@ -257,6 +256,8 @@ void frmContactEditorGroup::SetupPointers(std::map<int, wxString> *GroupsList,
        int GroupIndex)\r
 {\r
 \r
+       // Setup the pointers.\r
+       \r
        GroupsListCtrlPtr = GroupsListCtrl;\r
        GroupsListPtr = GroupsList;\r
        AccName = AccountName;\r
@@ -267,6 +268,8 @@ void frmContactEditorGroup::SetupPointers(std::map<int, wxString> *GroupsList,
 void frmContactEditorGroup::SetEditorMode(bool EditMode, XABViewMode XVMIn)\r
 {\r
 \r
+       // Setup the editor mode.\r
+       \r
        EditorMode = EditMode;\r
        XVMData = XVMIn;\r
 \r
@@ -277,5 +280,9 @@ void frmContactEditorGroup::SetEditorMode(bool EditMode, XABViewMode XVMIn)
 \r
 void frmContactEditorGroup::CloseWindow( wxCommandEvent& event )\r
 {\r
+       \r
+       // Close this window.\r
+       \r
        this->Close();\r
+       \r
 }\r