From bac054ea5eda94fe663d8b1a7c680ae80de8075c Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 9 Sep 2017 18:42:49 +0100
Subject: [PATCH] frmContactEditor: Fix issue with intValueSeek not being
 incremented properly

---
 .../frmContactEditor-Business.cpp             | 39 ++++++++++++------
 .../frmContactEditor-Calendar.cpp             |  9 +++--
 .../frmContactEditor-Category.cpp             |  3 +-
 .../frmContactEditor-General.cpp              | 40 +++++++++++++------
 .../contacteditor/frmContactEditor-Groups.cpp |  3 +-
 .../contacteditor/frmContactEditor-Home.cpp   | 39 ++++++++++++------
 source/contacteditor/frmContactEditor-Key.cpp |  3 +-
 .../contacteditor/frmContactEditor-Logo.cpp   |  3 +-
 .../contacteditor/frmContactEditor-Other.cpp  |  6 ++-
 .../frmContactEditor-Picture.cpp              |  3 +-
 .../contacteditor/frmContactEditor-Sound.cpp  |  3 +-
 11 files changed, 101 insertions(+), 50 deletions(-)

diff --git a/source/contacteditor/frmContactEditor-Business.cpp b/source/contacteditor/frmContactEditor-Business.cpp
index 245b348..1641393 100644
--- a/source/contacteditor/frmContactEditor-Business.cpp
+++ b/source/contacteditor/frmContactEditor-Business.cpp
@@ -52,7 +52,8 @@ void frmContactEditor::AddBusinessNickname( wxCommandEvent& event )
 	frameCENickname->ShowModal();
 	delete frameCENickname;
 	frameCENickname = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessNickname( wxCommandEvent& event )
@@ -144,7 +145,8 @@ void frmContactEditor::AddBusinessAddress( wxCommandEvent& event )
 	frameCEAddress->ShowModal();
 	delete frameCEAddress;
 	frameCEAddress = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessAddress( wxCommandEvent& event )
@@ -235,7 +237,8 @@ void frmContactEditor::AddBusinessEmail( wxCommandEvent& event )
 	frameCEEmail->ShowModal();
 	delete frameCEEmail;
 	frameCEEmail = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessEmail( wxCommandEvent& event )
@@ -315,7 +318,8 @@ void frmContactEditor::AddBusinessIM( wxCommandEvent& event )
 	frameCEIM->ShowModal();
 	delete frameCEIM;
 	frameCEIM = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessIM( wxCommandEvent& event )
@@ -397,7 +401,8 @@ void frmContactEditor::AddBusinessTelephone( wxCommandEvent& event )
 	frameCETel->ShowModal();
 	delete frameCETel;
 	frameCETel = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessTelephone( wxCommandEvent& event )
@@ -476,7 +481,8 @@ void frmContactEditor::AddBusinessLanguage( wxCommandEvent& event )
 	frameCELang->ShowModal();
 	delete frameCELang;
 	frameCELang = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessLanguage( wxCommandEvent& event )
@@ -555,7 +561,8 @@ void frmContactEditor::AddBusinessTimezone( wxCommandEvent& event )
 	frameCETZ->ShowModal();
 	delete frameCETZ;
 	frameCETZ = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessTimezone( wxCommandEvent& event )
@@ -636,7 +643,8 @@ void frmContactEditor::AddBusinessGeoposition( wxCommandEvent& event )
 	frameCEGeo->ShowModal();
 	delete frameCEGeo;
 	frameCEGeo = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessGeoposition( wxCommandEvent& event )
@@ -718,7 +726,8 @@ void frmContactEditor::AddBusinessWebsite( wxCommandEvent& event )
 	frameCEWeb->ShowModal();
 	delete frameCEWeb;
 	frameCEWeb = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessWebsite( wxCommandEvent& event )
@@ -798,7 +807,8 @@ void frmContactEditor::AddBusinessTitle( wxCommandEvent& event )
 	frameCETitle->ShowModal();
 	delete frameCETitle;
 	frameCETitle = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessTitle( wxCommandEvent& event )
@@ -878,7 +888,8 @@ void frmContactEditor::AddBusinessRole( wxCommandEvent& event )
 	frameCERole->ShowModal();
 	delete frameCERole;
 	frameCERole = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessRole( wxCommandEvent& event )
@@ -959,7 +970,8 @@ void frmContactEditor::AddBusinessOrganisation( wxCommandEvent& event )
 	frameCEOrg->ShowModal();
 	delete frameCEOrg;
 	frameCEOrg = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessOrganisation( wxCommandEvent& event )
@@ -1041,7 +1053,8 @@ void frmContactEditor::AddBusinessNote( wxCommandEvent& event )
 	frameCENote->ShowModal();
 	delete frameCENote;
 	frameCENote = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyBusinessNote( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Calendar.cpp b/source/contacteditor/frmContactEditor-Calendar.cpp
index 083dc80..aa9b3de 100644
--- a/source/contacteditor/frmContactEditor-Calendar.cpp
+++ b/source/contacteditor/frmContactEditor-Calendar.cpp
@@ -37,7 +37,8 @@ void frmContactEditor::AddCalendarAddress( wxCommandEvent& event )
 	frameCECalAdr->ShowModal();
 	delete frameCECalAdr;
 	frameCECalAdr = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyCalendarAddress( wxCommandEvent& event )
@@ -114,7 +115,8 @@ void frmContactEditor::AddCalendarRequest( wxCommandEvent& event )
 	frameCECalAdr->ShowModal();
 	delete frameCECalAdr;
 	frameCECalAdr = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyCalendarRequest( wxCommandEvent& event )
@@ -192,7 +194,8 @@ void frmContactEditor::AddFreeBusy( wxCommandEvent& event )
 	frameCECalAdr->ShowModal();
 	delete frameCECalAdr;
 	frameCECalAdr = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyFreeBusy( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Category.cpp b/source/contacteditor/frmContactEditor-Category.cpp
index 3fc61ae..f3e919f 100644
--- a/source/contacteditor/frmContactEditor-Category.cpp
+++ b/source/contacteditor/frmContactEditor-Category.cpp
@@ -37,7 +37,8 @@ void frmContactEditor::AddCategory( wxCommandEvent& event )
 	frameCECategory->ShowModal();
 	delete frameCECategory;
 	frameCECategory = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyCategory( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-General.cpp b/source/contacteditor/frmContactEditor-General.cpp
index 96249b3..9f892eb 100644
--- a/source/contacteditor/frmContactEditor-General.cpp
+++ b/source/contacteditor/frmContactEditor-General.cpp
@@ -52,6 +52,7 @@ void frmContactEditor::AddGeneralNickname( wxCommandEvent& event )
 	frameCENickname->ShowModal();
 	delete frameCENickname;
 	frameCENickname = NULL;
+    intValueSeek++;
 	
 }
 
@@ -140,7 +141,8 @@ void frmContactEditor::AddGeneralAddress( wxCommandEvent& event )
 	frameCEAddress->ShowModal();
 	delete frameCEAddress;
 	frameCEAddress = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralAddress( wxCommandEvent& event )
@@ -238,7 +240,8 @@ void frmContactEditor::AddGeneralEmail( wxCommandEvent& event )
 	frameCEEmail->ShowModal();
 	delete frameCEEmail;
 	frameCEEmail = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralEmail( wxCommandEvent& event )
@@ -318,7 +321,8 @@ void frmContactEditor::AddGeneralIM( wxCommandEvent& event )
 	frameCEIM->ShowModal();
 	delete frameCEIM;
 	frameCEIM = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralIM( wxCommandEvent& event )
@@ -399,7 +403,8 @@ void frmContactEditor::AddGeneralTelephone( wxCommandEvent& event )
 	frameCETel->ShowModal();
 	delete frameCETel;
 	frameCETel = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralTelephone( wxCommandEvent& event )
@@ -478,7 +483,8 @@ void frmContactEditor::AddGeneralLanguages( wxCommandEvent& event )
 	frameCELang->ShowModal();
 	delete frameCELang;
 	frameCELang = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralLanguages( wxCommandEvent& event )
@@ -556,7 +562,8 @@ void frmContactEditor::AddGeneralTimezone( wxCommandEvent& event )
 	frameCETZ->ShowModal();
 	delete frameCETZ;
 	frameCETZ = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralTimezone( wxCommandEvent& event )
@@ -636,7 +643,8 @@ void frmContactEditor::AddGeneralGeoposition( wxCommandEvent& event )
 	frameCEGeo->ShowModal();
 	delete frameCEGeo;
 	frameCEGeo = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralGeoposition( wxCommandEvent& event )
@@ -719,7 +727,8 @@ void frmContactEditor::AddGeneralRelated( wxCommandEvent& event )
 	frameCERel->ShowModal();
 	delete frameCERel;
 	frameCERel = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralRelated( wxCommandEvent& event )
@@ -799,7 +808,8 @@ void frmContactEditor::AddGeneralWebsite( wxCommandEvent& event )
 	frameCEWeb->ShowModal();
 	delete frameCEWeb;
 	frameCEWeb = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralWebsite( wxCommandEvent& event )
@@ -879,7 +889,8 @@ void frmContactEditor::AddGeneralTitle( wxCommandEvent& event )
 	frameCETitle->ShowModal();
 	delete frameCETitle;
 	frameCETitle = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralTitle( wxCommandEvent& event )
@@ -959,7 +970,8 @@ void frmContactEditor::AddGeneralRole( wxCommandEvent& event )
 	frameCERole->ShowModal();
 	delete frameCERole;
 	frameCERole = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralRole( wxCommandEvent& event )
@@ -1040,7 +1052,8 @@ void frmContactEditor::AddGeneralOrganisation( wxCommandEvent& event )
 	frameCEOrg->ShowModal();
 	delete frameCEOrg;
 	frameCEOrg = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralOrganisation( wxCommandEvent& event )
@@ -1122,7 +1135,8 @@ void frmContactEditor::AddGeneralNote( wxCommandEvent& event )
 	frameCENote->ShowModal();
 	delete frameCENote;
 	frameCENote = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGeneralNote( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Groups.cpp b/source/contacteditor/frmContactEditor-Groups.cpp
index b3e5f10..225fa2a 100644
--- a/source/contacteditor/frmContactEditor-Groups.cpp
+++ b/source/contacteditor/frmContactEditor-Groups.cpp
@@ -39,7 +39,8 @@ void frmContactEditor::AddGroup( wxCommandEvent& event )
 	frameCEGroup->ShowModal();
 	delete frameCEGroup;
 	frameCEGroup = NULL;
-    
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyGroup( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Home.cpp b/source/contacteditor/frmContactEditor-Home.cpp
index e610a94..33769e3 100644
--- a/source/contacteditor/frmContactEditor-Home.cpp
+++ b/source/contacteditor/frmContactEditor-Home.cpp
@@ -52,7 +52,8 @@ void frmContactEditor::AddHomeNickname( wxCommandEvent& event )
 	frameCENickname->ShowModal();
 	delete frameCENickname;
 	frameCENickname = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeNickname( wxCommandEvent& event )
@@ -140,7 +141,8 @@ void frmContactEditor::AddHomeAddress( wxCommandEvent& event )
 	frameCEAddress->ShowModal();
 	delete frameCEAddress;
 	frameCEAddress = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeAddress( wxCommandEvent& event )
@@ -228,7 +230,8 @@ void frmContactEditor::AddHomeEmail( wxCommandEvent& event )
 	frameCEEmail->ShowModal();
 	delete frameCEEmail;
 	frameCEEmail = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeEmail( wxCommandEvent& event )
@@ -306,7 +309,8 @@ void frmContactEditor::AddHomeIM( wxCommandEvent& event )
 	frameCEIM->ShowModal();
 	delete frameCEIM;
 	frameCEIM = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeIM( wxCommandEvent& event )
@@ -384,7 +388,8 @@ void frmContactEditor::AddHomeTelephone( wxCommandEvent& event )
 	frameCETel->ShowModal();
 	delete frameCETel;
 	frameCETel = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeTelephone( wxCommandEvent& event )
@@ -459,7 +464,8 @@ void frmContactEditor::AddHomeLanguage( wxCommandEvent& event )
 	frameCELang->ShowModal();
 	delete frameCELang;
 	frameCELang = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeLanguage( wxCommandEvent& event )
@@ -534,7 +540,8 @@ void frmContactEditor::AddHomeTimezone( wxCommandEvent& event )
 	frameCETZ->ShowModal();
 	delete frameCETZ;
 	frameCETZ = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeTimezone( wxCommandEvent& event )
@@ -611,7 +618,8 @@ void frmContactEditor::AddHomeGeoposition( wxCommandEvent& event )
 	frameCEGeo->ShowModal();
 	delete frameCEGeo;
 	frameCEGeo = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeGeoposition( wxCommandEvent& event )
@@ -689,7 +697,8 @@ void frmContactEditor::AddHomeWebsite( wxCommandEvent& event )
 	frameCEWeb->ShowModal();
 	delete frameCEWeb;
 	frameCEWeb = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeWebsite( wxCommandEvent& event )
@@ -765,7 +774,8 @@ void frmContactEditor::AddHomeTitle( wxCommandEvent& event )
 	frameCETitle->ShowModal();
 	delete frameCETitle;
 	frameCETitle = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeTitle( wxCommandEvent& event )
@@ -841,7 +851,8 @@ void frmContactEditor::AddHomeRole( wxCommandEvent& event )
 	frameCERole->ShowModal();
 	delete frameCERole;
 	frameCERole = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeRole( wxCommandEvent& event )
@@ -918,7 +929,8 @@ void frmContactEditor::AddHomeOrganisation( wxCommandEvent& event )
 	frameCEOrg->ShowModal();
 	delete frameCEOrg;
 	frameCEOrg = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeOrganisation( wxCommandEvent& event )
@@ -996,7 +1008,8 @@ void frmContactEditor::AddHomeNote( wxCommandEvent& event )
 	frameCENote->ShowModal();
 	delete frameCENote;
 	frameCENote = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyHomeNote( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Key.cpp b/source/contacteditor/frmContactEditor-Key.cpp
index 3dd7876..b9edcaf 100644
--- a/source/contacteditor/frmContactEditor-Key.cpp
+++ b/source/contacteditor/frmContactEditor-Key.cpp
@@ -39,7 +39,8 @@ void frmContactEditor::AddKey( wxCommandEvent& event )
 	frameCEKey->ShowModal();
 	delete frameCEKey;
 	frameCEKey = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyKey( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Logo.cpp b/source/contacteditor/frmContactEditor-Logo.cpp
index ce5649a..e4f7c96 100644
--- a/source/contacteditor/frmContactEditor-Logo.cpp
+++ b/source/contacteditor/frmContactEditor-Logo.cpp
@@ -104,7 +104,8 @@ void frmContactEditor::AddLogo( wxCommandEvent& event )
 	frameCELogo->ShowModal();
 	delete frameCELogo;
 	frameCELogo = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyLogo( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Other.cpp b/source/contacteditor/frmContactEditor-Other.cpp
index 171b3ae..bbf8dc8 100644
--- a/source/contacteditor/frmContactEditor-Other.cpp
+++ b/source/contacteditor/frmContactEditor-Other.cpp
@@ -35,7 +35,8 @@ void frmContactEditor::AddVendorNamespace( wxCommandEvent& event )
 	frameCEVen->ShowModal();
 	delete frameCEVen;
 	frameCEVen = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyVendorNamespace( wxCommandEvent& event )
@@ -100,7 +101,8 @@ void frmContactEditor::AddXToken( wxCommandEvent& event )
 	frameCEXT->ShowModal();
 	delete frameCEXT;
 	frameCEXT = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyXToken( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Picture.cpp b/source/contacteditor/frmContactEditor-Picture.cpp
index fd9d169..e2eeae7 100644
--- a/source/contacteditor/frmContactEditor-Picture.cpp
+++ b/source/contacteditor/frmContactEditor-Picture.cpp
@@ -43,7 +43,8 @@ void frmContactEditor::AddPicture( wxCommandEvent& event )
 	frameCEPicture->ShowModal();
 	delete frameCEPicture;
 	frameCEPicture = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifyPicture( wxCommandEvent& event )
diff --git a/source/contacteditor/frmContactEditor-Sound.cpp b/source/contacteditor/frmContactEditor-Sound.cpp
index 369238c..99febcc 100644
--- a/source/contacteditor/frmContactEditor-Sound.cpp
+++ b/source/contacteditor/frmContactEditor-Sound.cpp
@@ -39,7 +39,8 @@ void frmContactEditor::AddSound( wxCommandEvent& event )
 	frameCESound->ShowModal();
 	delete frameCESound;
 	frameCESound = NULL;
-	
+    intValueSeek++;
+
 }
 
 void frmContactEditor::ModifySound( wxCommandEvent& event )
-- 
2.39.2