From f0be1fe8aeec9540bc5725f1052395644a77f035 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Wed, 7 Jan 2015 16:47:56 +0000 Subject: Tox: partly reverted r11785 git-svn-id: http://svn.miranda-ng.org/main/trunk@11787 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tox/src/tox_messages.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/protocols/Tox/src/tox_messages.cpp b/protocols/Tox/src/tox_messages.cpp index 39d37a47dc..9926068014 100644 --- a/protocols/Tox/src/tox_messages.cpp +++ b/protocols/Tox/src/tox_messages.cpp @@ -44,16 +44,16 @@ int __cdecl CToxProto::SendMsg(MCONTACT hContact, int flags, const char* msg) return 0; } - WaitForSingleObject(hToxEvent, INFINITE); - int result = 0; - if (strncmp(msg, "/me ", 4) != 0) - { - result = tox_send_message(tox, number, (uint8_t*)msg, (uint16_t)strlen(msg)); - } - else { - result = tox_send_action(tox, number, (uint8_t*)&msg[4], (uint16_t)strlen(msg) - 4); + if (strncmp(msg, "/me ", 4) != 0) + { + result = tox_send_message(tox, number, (uint8_t*)msg, (uint16_t)strlen(msg)); + } + else + { + result = tox_send_action(tox, number, (uint8_t*)&msg[4], (uint16_t)strlen(msg) - 4); + } } if (result == 0) @@ -122,8 +122,6 @@ int __cdecl CToxProto::UserIsTyping(MCONTACT hContact, int type) uint32_t number = tox_get_friend_number(tox, clientId.data()); if (number >= 0) { - WaitForSingleObject(hToxEvent, INFINITE); - tox_set_user_is_typing(tox, number, type); return 0; } -- cgit v1.2.3