frmContactEditor: Stop XAB crashing when pressing Modify/Delete

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

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 7ed1c92..c6ae96a 100644 (file)
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -82,26 +82,10 @@ bool frmContactEditor::LoadContact(wxString Filename){
        
        // Get the line.
 
-       bool QuoteMode = FALSE;
-       bool PropertyFind = TRUE;
-       bool HasExtraNicknames = FALSE;
-       bool IgnoreGender = FALSE;
-       bool ExtraLineSeek = TRUE;
-       bool FNProcessed = FALSE;
-       bool GenderProcessed = FALSE;
-       bool NameProcessed = FALSE;
-       bool ETagFound = FALSE;
-       bool ETagOrigFound = FALSE;
-       bool VersionProcessed = FALSE;
-       int intExtraNickname = 0;
        wxString wxSProperty;
        wxString wxSPropertySeg1;
        wxString wxSPropertySeg2;
        wxString wxSPropertyNextLine;
-       size_t ContactLineLen = 0;
-       int QuoteBreakPoint = 0;
-       int FNCount = 0;
-       int NameCount = 0;
        int NicknameCount = 0;
        int ADRCount = 0;
        int EmailCount = 0;
@@ -117,7 +101,6 @@ bool frmContactEditor::LoadContact(wxString Filename){
        int OrgCount = 0;
        int NoteCount = 0;
        int CategoryCount = 0;
-       int GroupCount = 0;
        int PhotoCount = 0;
        int LogoCount = 0;
        int SoundCount = 0;
@@ -466,22 +449,22 @@ void frmContactEditor::SplitValues(wxString *PropertyLine,
                if (PropertyLine->Mid(i, 1) == wxT(";") &&
                    PropertyLine->Mid((i - 1), 1) != wxT("\\")){
           
-                   if (intSplitsFound == 0){
+                       if (intSplitsFound == 0){
            
-                       SplitLength->insert(std::make_pair(intSplitsFound, (intSplitSize)));
+                               SplitLength->insert(std::make_pair(intSplitsFound, (intSplitSize)));
          
-                   } else {
+                       } else {
           
-                       SplitLength->insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
-           
-                   }
+                               SplitLength->insert(std::make_pair(intSplitsFound, (intSplitSize - 1)));
            
-                   SplitPoints->insert(std::make_pair(intSplitsFound, (i + 1)));
+                       }
            
-                   intSplitsFound++;
-                   intSplitSeek = i;
-                   intSplitSize = 0;
+                       SplitPoints->insert(std::make_pair(intSplitsFound, (i + 1)));
            
+                       intSplitsFound++;
+                       intSplitSeek = i;
+                       intSplitSize = 0;
+               
                }
 
        }