From e8c67aa8819b0ca83726f8606d3ab2b4c7b64188 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 3 Jun 2021 14:59:24 +0300 Subject: =?UTF-8?q?fixes=20#2733=20(ICQ:=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?= =?UTF-8?q?=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=81=D0=BF=D0=B0=D0=BC=D0=B5=D1=80=D1=81=D0=BA=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=87=D0=B0=D1=82=D0=B0=20=D1=87=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B7=20=D0=BE=D1=84.=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82,?= =?UTF-8?q?=20=D0=BE=D0=BD=20=D0=BD=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D0=B8=D0=B7=20=D0=9C=D0=B8=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B4=D1=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/ICQ-WIM/src/ignore.cpp | 4 ++-- protocols/ICQ-WIM/src/server.cpp | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'protocols/ICQ-WIM/src') diff --git a/protocols/ICQ-WIM/src/ignore.cpp b/protocols/ICQ-WIM/src/ignore.cpp index 00578d6c17..3ccbf95271 100644 --- a/protocols/ICQ-WIM/src/ignore.cpp +++ b/protocols/ICQ-WIM/src/ignore.cpp @@ -51,11 +51,11 @@ void CIcqProto::ProcessPermissions(const JSONNode &ev) CMStringW wszId(it.as_mstring()); auto *p = FindContactByUIN(wszId); if (p == nullptr) { - auto hContact = CreateContact(wszId, false); - Contact_Hide(hContact); + CreateContact(wszId, false); p = FindContactByUIN(wszId); } p->m_iApparentMode = ID_STATUS_OFFLINE; + Contact_Hide(p->m_hContact); m_bIgnoreListEmpty = false; } diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index b6eb594f6a..354f43ac65 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -282,7 +282,11 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact) CMStringW wszChatId(buddy["aimId"].as_mstring()); CMStringW wszChatName(buddy["friendly"].as_mstring()); - SESSION_INFO *si = Chat_NewSession(GCW_CHATROOM, m_szModuleName, wszChatId, wszChatName); + auto *pContact = FindContactByUIN(wszId); + if (pContact && pContact->m_iApparentMode == ID_STATUS_OFFLINE) + return INVALID_CONTACT_ID; + + auto *si = Chat_NewSession(GCW_CHATROOM, m_szModuleName, wszChatId, wszChatName); if (si == nullptr) return INVALID_CONTACT_ID; -- cgit v1.2.3