From a46d893e212c2948811b10a6ac84b0150efa09dd Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 21 Mar 2023 11:40:35 +0300
Subject: =?UTF-8?q?fixes=20#3116=20(Jabber:=20=D1=83=D0=B4=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BD=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8B=20=D0=B8=D0=B7=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=B9=D1=82=D0=B8=20=D0=B2=20=D0=BD=D0=B5=D1=91?=
 =?UTF-8?q?=20=D1=81=D0=BD=D0=BE=D0=B2=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/JabberG/src/jabber_events.cpp    |  3 ---
 protocols/JabberG/src/jabber_groupchat.cpp | 10 ++++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index d2a863bfa5..ed4976e769 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -55,9 +55,6 @@ void CJabberProto::OnContactDeleted(MCONTACT hContact)
 
 		ListRemove(LIST_ROSTER, jid);
 	}
-
-	if (isChatRoom(hContact))
-		ListRemove(LIST_CHATROOM, jid);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 82147b8d1a..81f432bc0f 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -206,13 +206,11 @@ INT_PTR __cdecl CJabberProto::OnJoinChat(WPARAM hContact, LPARAM)
 INT_PTR __cdecl CJabberProto::OnLeaveChat(WPARAM hContact, LPARAM)
 {
 	ptrA jid(ContactToJID(hContact));
-	if (jid != nullptr) {
-		if (getWord(hContact, "Status", 0) != ID_STATUS_OFFLINE) {
-			JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_CHATROOM, jid);
-			if (item != nullptr)
+	if (jid != nullptr)
+		if (getWord(hContact, "Status", 0) != ID_STATUS_OFFLINE)
+			if (JABBER_LIST_ITEM *item = ListGetItemPtr(LIST_CHATROOM, jid))
 				GcQuit(item, 200, nullptr);
-		}
-	}
+
 	return 0;
 }
 
-- 
cgit v1.2.3