1 files changed, 18 insertions, 29 deletions
diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp
index 5b6d345c9c..60864594e7 100644
--- a/protocols/Tox/src/tox_proto.cpp
+++ b/protocols/Tox/src/tox_proto.cpp
@@ -2,26 +2,22 @@
 
 CToxProto::CToxProto(const char* protoName, const wchar_t* userName)
 	: PROTO<CToxProto>(protoName, userName),
-	toxThread(nullptr), isTerminated(false),
+	m_toxThread(nullptr), isTerminated(false),
 	hCheckingThread(nullptr), hPollingThread(nullptr),
 	hMessageProcess(1)
 {
 	InitNetlib();
 
-	wszAccountName = mir_wstrdup(userName);
-	wszGroup = getWStringA(TOX_SETTINGS_GROUP);
-	if (wszGroup == nullptr)
-		wszGroup = mir_wstrdup(L"Tox");
-	Clist_GroupCreate(0, wszGroup);
+	m_accountName = mir_wstrdup(userName);
+	m_defaultGroup = getWStringA(TOX_SETTINGS_GROUP);
+	if (m_defaultGroup == nullptr)
+		m_defaultGroup = mir_wstrdup(L"Tox");
+	Clist_GroupCreate(0, m_defaultGroup);
 
 	CreateProtoService(PS_CREATEACCMGRUI, &CToxProto::OnAccountManagerInit);
 
 	SetAllContactsStatus(ID_STATUS_OFFLINE);
 
-	// services
-	CreateProtoService(PSR_AUDIO, &CToxProto::OnRecvAudioCall);
-	CreateProtoService("/Audio/Ring", &CToxProto::OnAudioRing);
-
 	// avatars
 	CreateProtoService(PS_GETAVATARCAPS, &CToxProto::GetAvatarCaps);
 	CreateProtoService(PS_GETAVATARINFO, &CToxProto::GetAvatarInfo);
@@ -31,15 +27,11 @@ CToxProto::CToxProto(const char* protoName, const wchar_t* userName)
 	// nick
 	CreateProtoService(PS_SETMYNICKNAME, &CToxProto::SetMyNickname);
 
-	// hAudioDialogs = WindowList_Create();
-
 	hTerminateEvent = CreateEvent(nullptr, FALSE, FALSE, nullptr);
 }
 
 CToxProto::~CToxProto()
 {
-	WindowList_Destroy(hAudioDialogs);
-
 	UninitNetlib();
 }
 
@@ -151,15 +143,13 @@ int CToxProto::SetStatus(int iNewStatus)
 	int old_status = m_iStatus;
 	m_iDesiredStatus = iNewStatus;
 
+	// logout
 	if (iNewStatus == ID_STATUS_OFFLINE) {
-		// logout
 		isTerminated = true;
 		SetEvent(hTerminateEvent);
 
-		if (!Miranda_IsTerminated()) {
+		if (!Miranda_IsTerminated())
 			SetAllContactsStatus(ID_STATUS_OFFLINE);
-			//CloseAllChatChatSessions();
-		}
 
 		m_iStatus = m_iDesiredStatus = ID_STATUS_OFFLINE;
 		ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);
@@ -169,19 +159,20 @@ int CToxProto::SetStatus(int iNewStatus)
 	if (old_status >= ID_STATUS_CONNECTING && old_status < ID_STATUS_OFFLINE)
 		return 0;
 
+	// login
 	if (old_status == ID_STATUS_OFFLINE && !IsOnline()) {
-		// login
 		isTerminated = false;
 		m_iStatus = ID_STATUS_CONNECTING;
 		hPollingThread = ForkThreadEx(&CToxProto::PollingThread, nullptr, nullptr);
+		ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);
+		return 0;
 	}
-	else {
-		// set tox status
-		m_iStatus = iNewStatus;
-		tox_self_set_status(toxThread->Tox(), MirandaToToxStatus(iNewStatus));
-	}
-
+	
+	// change status
+	m_iStatus = iNewStatus;
+	tox_self_set_status(m_toxThread->Tox(), MirandaToToxStatus(iNewStatus));
 	ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)old_status, m_iStatus);
+	
 	return 0;
 }
 
@@ -200,7 +191,7 @@ int CToxProto::SetAwayMsg(int, const wchar_t *msg)
 	if (IsOnline()) {
 		T2Utf statusMessage(msg);
 		TOX_ERR_SET_INFO error;
-		if (!tox_self_set_status_message(toxThread->Tox(), (uint8_t*)(char*)statusMessage, min(TOX_MAX_STATUS_MESSAGE_LENGTH, mir_strlen(statusMessage)), &error))
+		if (!tox_self_set_status_message(m_toxThread->Tox(), (uint8_t*)(char*)statusMessage, min(TOX_MAX_STATUS_MESSAGE_LENGTH, mir_strlen(statusMessage)), &error))
 			debugLogA(__FUNCTION__": failed to set status status message %s (%d)", msg, error);
 	}
 
@@ -228,9 +219,7 @@ int CToxProto::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam)
 		return OnInitStatusMenu();
 
 	case EV_PROTO_ONERASE:
-		ptrW profilePath(GetToxProfilePath());
-		_wunlink(profilePath);
-		break;
+		return OnDeleteToxProfile();
 	}
 
 	return 1;