From 6fc8beb2129b3209c7fcd464ef812b765429c7fa Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 31 Oct 2022 12:00:07 +0300
Subject: fixes #3211 completely

---
 protocols/JabberG/src/jabber_chat.cpp   | 2 --
 protocols/JabberG/src/jabber_thread.cpp | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'protocols/JabberG/src')

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 627b6668a8..0e181acac6 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -153,8 +153,6 @@ int CJabberProto::GcInit(JABBER_LIST_ITEM *item)
 	for (int i = _countof(sttStatuses) - 1; i >= 0; i--)
 		Chat_AddGroup(si, TranslateW(Utf2T(sttStatuses[i])));
 
-	Chat_Control(m_szModuleName, wszJid, (item->bAutoJoin && m_bAutoJoinHidden) ? WINDOW_HIDDEN : SESSION_INITDONE);
-
 	time_t lastDate = getDword(si->hContact, "LastGetVcard"), now = time(0);
 	if (now - lastDate > 24 * 60 * 60) {
 		SendGetVcard(si->hContact);
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index f45e313e05..d234e46dac 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -157,7 +157,9 @@ void CJabberProto::CheckKeepAlive()
 		if (auto *item = ListGetItemPtrFromIndex(i)) {
 			if (!item->bChatLogging && now - item->iChatInitTime > 2) {
 				item->bChatLogging = true;
-				Chat_Control(m_szModuleName, Utf2T(item->jid), SESSION_ONLINE);
+				Utf2T wszJid(item->jid);
+				Chat_Control(m_szModuleName, wszJid, (item->bAutoJoin && m_bAutoJoinHidden) ? WINDOW_HIDDEN : SESSION_INITDONE);
+				Chat_Control(m_szModuleName, wszJid, SESSION_ONLINE);
 			}
 		}
 	}
-- 
cgit v1.2.3