frmContactEditor: Stop XAB crashing when pressing Modify/Delete

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

diff --git a/source/contacteditor/frmContactEditor.cpp b/source/contacteditor/frmContactEditor.cpp
index 22de535..4856537 100644 (file)
--- a/source/contacteditor/frmContactEditor.cpp
+++ b/source/contacteditor/frmContactEditor.cpp
@@ -105,6 +105,19 @@ frmContactEditorADT( parent )
     
 }
 
+frmContactEditor::~frmContactEditor()
+{
+       
+       if (AudioStreamPlaybackPointer != nullptr)
+       {
+               
+               delete AudioStreamPlaybackPointer;
+               AudioStreamPlaybackPointer = nullptr;
+               
+       }
+       
+}
+
 void frmContactEditor::CloseContact( wxCommandEvent& event )
 {
     
@@ -159,6 +172,12 @@ void frmContactEditor::SetupContact( wxString AccountName )
     
 }
 
+void frmContactEditor::SetupAccountData(bool UnsupportedAccount){
+       
+       boolUnsupportedAccount = UnsupportedAccount;
+       
+}
+
 int frmContactEditor::GetLastInt(std::map<int, wxString> *MapData){
     
        /*
@@ -204,14 +223,14 @@ bool frmContactEditor::GetSelectedItem(wxListCtrl *ListCtrlPtr,
                wxLIST_NEXT_ALL,
                wxLIST_STATE_SELECTED);
     
-       *intSelectedData = (int)ListCtrlPtr->GetItemData(*longSelected);
-    
        if (*longSelected == -1){
                return FALSE;
-       } else {
-               return TRUE;
        }
     
+       *intSelectedData = (int)ListCtrlPtr->GetItemData(*longSelected);
+
+       return TRUE;    
+       
 }
 
 void frmContactEditor::DeleteMapDataProcess(int IndexNum, std::map<int, std::string>* MapData){
@@ -486,8 +505,16 @@ void frmContactEditor::ProcessSaveDataStrProc( wxString PropName,
     
        strIter = MapData->find(intIterVal);
     
+       if (strIter == MapData->end()){
+               
+               // Ignore this section and return.
+               
+               return;
+               
+       }
+                                                     
        wxString strPropValue;
-    
+
        if (strIter->first == intIterVal){
         
                strPropValue = strIter->second;