X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor.cpp;h=ad16901adc458d774ad2eeda0e9201965f756352;hp=4acb350cccbe0e92476cfb36d82f6a4c028c29cb;hb=3c4b20954ac161e85084a6f5960b7d38d2d48396;hpb=1c4d53efb070de9845e7c218ff1f12ebe2f98625

diff --git a/source/contacteditor/frmContactEditor.cpp b/source/contacteditor/frmContactEditor.cpp
index 4acb350..ad16901 100644
--- a/source/contacteditor/frmContactEditor.cpp
+++ b/source/contacteditor/frmContactEditor.cpp
@@ -65,11 +65,6 @@
 #include "../common/uuid.h"
 #include "../common/dirs.h"
 
-// TODO: Investigate problems with SFML & PulseAudio - CPU usage problems when
-// not being used.
-
-// Replace intResult with intValueSeek.
-
 BEGIN_EVENT_TABLE(frmContactEditor, wxFrame)
 EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, frmContactEditor::ContactFileChanged)
 END_EVENT_TABLE()
@@ -105,6 +100,19 @@ frmContactEditorADT( parent )
     
 }
 
+frmContactEditor::~frmContactEditor()
+{
+	
+	if (AudioStreamPlaybackPointer != nullptr)
+	{
+		
+		delete AudioStreamPlaybackPointer;
+		AudioStreamPlaybackPointer = nullptr;
+		
+	}
+	
+}
+
 void frmContactEditor::CloseContact( wxCommandEvent& event )
 {
     
@@ -159,20 +167,14 @@ void frmContactEditor::SetupContact( wxString AccountName )
     
 }
 
+void frmContactEditor::SetupAccountData(bool UnsupportedAccount){
+	
+	boolUnsupportedAccount = UnsupportedAccount;
+	
+}
+
 int frmContactEditor::GetLastInt(std::map<int, wxString> *MapData){
     
-	/*
-	int intResult = 0;
-     
-	std::map<int,wxString>::iterator iwxsit;
-     
-	for( iwxsit=(*MapData).begin(); iwxsit != (*MapData).end(); iwxsit++){
-	intResult = (*iwxsit).first;
-	}
-     
-	return intResult;
-	*/
-    
 	intValueSeek++;
 	return intValueSeek;
     
@@ -180,14 +182,6 @@ int frmContactEditor::GetLastInt(std::map<int, wxString> *MapData){
 
 int frmContactEditor::GetLastInt(std::map<int, std::string> *MapData){
     
-	/* int intResult = 0;
-     
-	std::map<int,std::string>::iterator iwxsit;
-     
-	for( iwxsit=(*MapData).begin(); iwxsit != (*MapData).end(); iwxsit++){
-	intResult = (*iwxsit).first;
-	}*/
-    
 	intValueSeek++;
 	return intValueSeek;
     
@@ -204,14 +198,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){