From 510f938a5c6f0ee95ac0b36e56aced065228298e Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Thu, 10 Sep 2015 11:58:58 +0000 Subject: Tox: tox pointers should store in PollingThread to avoid cross thread using git-svn-id: http://svn.miranda-ng.org/main/trunk@15316 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tox/src/tox_messages.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/Tox/src/tox_messages.cpp') diff --git a/protocols/Tox/src/tox_messages.cpp b/protocols/Tox/src/tox_messages.cpp index 00e928f168..fe3b205b0b 100644 --- a/protocols/Tox/src/tox_messages.cpp +++ b/protocols/Tox/src/tox_messages.cpp @@ -74,7 +74,7 @@ int CToxProto::OnSendMessage(MCONTACT hContact, const char *szMessage) } TOX_ERR_FRIEND_SEND_MESSAGE sendError; - int messageId = tox_friend_send_message(tox, friendNumber, type, msg, msgLen, &sendError); + int messageId = tox_friend_send_message(toxThread->tox, friendNumber, type, msg, msgLen, &sendError); if (sendError != TOX_ERR_FRIEND_SEND_MESSAGE_OK) { debugLogA(__FUNCTION__": failed to send message for %d (%d)", friendNumber, sendError); @@ -131,7 +131,7 @@ void CToxProto::GetStatusMessageAsync(void* arg) } TOX_ERR_FRIEND_QUERY error; - size_t size = tox_friend_get_status_message_size(tox, friendNumber, &error); + size_t size = tox_friend_get_status_message_size(toxThread->tox, friendNumber, &error); if (error != TOX_ERR_FRIEND_QUERY::TOX_ERR_FRIEND_QUERY_OK) { debugLogA(__FUNCTION__": failed to get status message for (%d) (%d)", friendNumber, error); @@ -140,7 +140,7 @@ void CToxProto::GetStatusMessageAsync(void* arg) } ptrA statusMessage((char*)mir_calloc(size + 1)); - if (!tox_friend_get_status_message(tox, friendNumber, (uint8_t*)(char*)statusMessage, &error)) + if (!tox_friend_get_status_message(toxThread->tox, friendNumber, (uint8_t*)(char*)statusMessage, &error)) { debugLogA(__FUNCTION__": failed to get status message for (%d) (%d)", friendNumber, error); ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_FAILED, (HANDLE)hContact, 0); @@ -159,7 +159,7 @@ int CToxProto::OnUserIsTyping(MCONTACT hContact, int type) return 0; TOX_ERR_SET_TYPING error; - if (!tox_self_set_typing(tox, friendNumber, type == PROTOTYPE_SELFTYPING_ON, &error)) + if (!tox_self_set_typing(toxThread->tox, friendNumber, type == PROTOTYPE_SELFTYPING_ON, &error)) debugLogA(__FUNCTION__": failed to send typing (%d)", error); return 0; -- cgit v1.2.3