Fixed potential crash with frmContactEditorTelephone in Edit mode.

[xestiaab/.git] / source / contacteditor / frmContactEditor-Other.cpp

diff --git a/source/contacteditor/frmContactEditor-Other.cpp b/source/contacteditor/frmContactEditor-Other.cpp
index a0ab8e3..d1af11f 100644 (file)
--- a/source/contacteditor/frmContactEditor-Other.cpp
+++ b/source/contacteditor/frmContactEditor-Other.cpp
@@ -1,3 +1,21 @@
+// frmContactEditor-Other.cpp - frmContactEditor Other tab subroutines.
+//
+// (c) 2012-2016 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 "frmContactEditor.h"
 #include "frmContactEditorVendor.h"
 #include "frmContactEditorXToken.h"
@@ -8,10 +26,10 @@ void frmContactEditor::AddVendorNamespace( wxCommandEvent& event )
     
     frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
     frameCEVen->SetEditorMode(FALSE);
-    intResult = GetLastInt(&VendorList);
-    frameCEVen->SetupPointers(&VendorList,
-                              &VendorListPEN,
-                              &VendorListElement,
+    intResult = GetLastInt(&ContactEditorData.VendorList);
+    frameCEVen->SetupPointers(&ContactEditorData.VendorList,
+                              &ContactEditorData.VendorListPEN,
+                              &ContactEditorData.VendorListElement,
                               lboVendorNamespace,
                               (intValueSeek));
     frameCEVen->ShowModal();
@@ -31,9 +49,9 @@ void frmContactEditor::ModifyVendorNamespace( wxCommandEvent& event )
     }
     
     frmContactEditorVendor *frameCEVen = new frmContactEditorVendor ( this );
-    frameCEVen->SetupPointers(&VendorList,
-                              &VendorListPEN,
-                              &VendorListElement,
+    frameCEVen->SetupPointers(&ContactEditorData.VendorList,
+                              &ContactEditorData.VendorListPEN,
+                              &ContactEditorData.VendorListElement,
                               lboVendorNamespace,
                               intSelectedData);
     frameCEVen->SetEditorMode(TRUE);
@@ -55,8 +73,8 @@ void frmContactEditor::DeleteVendorNamespace( wxCommandEvent& event )
     
     lboVendorNamespace->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &VendorList, &VendorListPEN,
-                  &VendorListElement);
+    DeleteMapData(intSelectedData, &ContactEditorData.VendorList, &ContactEditorData.VendorListPEN,
+                  &ContactEditorData.VendorListElement);
     
 }
 
@@ -66,9 +84,9 @@ void frmContactEditor::AddXToken( wxCommandEvent& event )
     
     frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
     frameCEXT->SetEditorMode(FALSE);
-    intResult = GetLastInt(&XTokenList);
-    frameCEXT->SetupPointers(&XTokenList,
-                             &XTokenListTokens,
+    intResult = GetLastInt(&ContactEditorData.XTokenList);
+    frameCEXT->SetupPointers(&ContactEditorData.XTokenList,
+                             &ContactEditorData.XTokenListTokens,
                              lboXToken,
                              (intValueSeek));
     frameCEXT->ShowModal();
@@ -88,8 +106,8 @@ void frmContactEditor::ModifyXToken( wxCommandEvent& event )
     }
     
     frmContactEditorXToken *frameCEXT = new frmContactEditorXToken ( this );
-    frameCEXT->SetupPointers(&XTokenList,
-                             &XTokenListTokens,
+    frameCEXT->SetupPointers(&ContactEditorData.XTokenList,
+                             &ContactEditorData.XTokenListTokens,
                              lboXToken,
                              intSelectedData);
     frameCEXT->SetEditorMode(TRUE);
@@ -111,6 +129,6 @@ void frmContactEditor::DeleteXToken( wxCommandEvent& event )
     
     lboXToken->DeleteItem(longSelected);
     
-    DeleteMapData(intSelectedData, &XTokenList, &XTokenListTokens);
+    DeleteMapData(intSelectedData, &ContactEditorData.XTokenList, &ContactEditorData.XTokenListTokens);
     
 }