From c4c1ce437199d554133859c635c3b986f1b353a9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 4 Mar 2023 18:05:38 +0300 Subject: fixes #3333 (Tox: search in Find/Add contacts tries to search any random input) --- protocols/Discord/src/proto.cpp | 10 +++++----- protocols/Discord/src/proto.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/Discord/src') diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp index cf5bd0671f..6f0ff667bb 100644 --- a/protocols/Discord/src/proto.cpp +++ b/protocols/Discord/src/proto.cpp @@ -301,13 +301,13 @@ void CDiscordProto::SearchThread(void *param) psr.firstName.w = L""; psr.lastName.w = L""; psr.id.w = L""; - ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)1, (LPARAM)&psr); + ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_DATA, this, (LPARAM)&psr); - ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)1, 0); + ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, this, 0); mir_free(param); } -HWND CDiscordProto::SearchAdvanced(HWND hwndDlg) +HANDLE CDiscordProto::SearchAdvanced(HWND hwndDlg) { if (!m_bOnline || !IsWindow(hwndDlg)) return nullptr; @@ -322,7 +322,7 @@ HWND CDiscordProto::SearchAdvanced(HWND hwndDlg) return nullptr; ForkThread(&CDiscordProto::SearchThread, mir_wstrdup(wszNick)); - return (HWND)1; + return this; } ///////////////////////////////////////////////////////////////////////////////////////// @@ -332,7 +332,7 @@ void CDiscordProto::OnReceiveUserinfo(NETLIBHTTPREQUEST *pReply, AsyncHttpReques { JsonReply root(pReply); if (!root) { - ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_FAILED, (HANDLE)1); + ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_FAILED, this); return; } diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h index dd69f60e20..bf13191c49 100644 --- a/protocols/Discord/src/proto.h +++ b/protocols/Discord/src/proto.h @@ -353,7 +353,7 @@ public: INT_PTR GetCaps(int, MCONTACT = 0) override; HWND CreateExtendedSearchUI(HWND owner) override; - HWND SearchAdvanced(HWND owner) override; + HANDLE SearchAdvanced(HWND owner) override; HANDLE SearchBasic(const wchar_t *id) override; MCONTACT AddToList(int flags, PROTOSEARCHRESULT *psr) override; -- cgit v1.2.3