From 5fd260b7c4c98bfa2d17a301d832a859c2af1f92 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 21 Jul 2024 16:17:48 +0300
Subject: =?UTF-8?q?fixes=20#4555=20(=D0=97=D0=B0=D0=B4=D0=B2=D0=B0=D0=B8?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=82=D1=8B=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B2,=20=D0=B3=D0=B4=D0=B5=20=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BA=D1=8D=D1=88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/Facebook/src/proto.cpp | 18 +++++++++++-------
 protocols/Facebook/src/proto.h   |  7 ++++---
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'protocols/Facebook/src')

diff --git a/protocols/Facebook/src/proto.cpp b/protocols/Facebook/src/proto.cpp
index ef8fdbbaa3..68b408d64b 100644
--- a/protocols/Facebook/src/proto.cpp
+++ b/protocols/Facebook/src/proto.cpp
@@ -118,6 +118,17 @@ FacebookProto::~FacebookProto()
 /////////////////////////////////////////////////////////////////////////////////////////
 // protocol events
 
+void FacebookProto::OnCacheInit()
+{
+	for (auto &cc : AccContacts()) {
+		m_bCacheInited = true;
+
+		CMStringA szId(getMStringA(cc, DBKEY_ID));
+		if (!szId.IsEmpty())
+			m_users.insert(new FacebookUser(_atoi64(szId), cc, isChatRoom(cc)));
+	}
+}
+
 void FacebookProto::OnContactAdded(MCONTACT hContact)
 {
 	__int64 userId = _atoi64(getMStringA(hContact, DBKEY_ID));
@@ -137,13 +148,6 @@ void FacebookProto::OnModulesLoaded()
 	wszPath.Format(L"%s\\%S\\Stickers\\*.webp", wszCache.get(), m_szModuleName);
 	SmileyAdd_LoadContactSmileys(SMADD_FOLDER, m_szModuleName, wszPath);
 
-	// contacts cache
-	for (auto &cc : AccContacts()) {
-		CMStringA szId(getMStringA(cc, DBKEY_ID));
-		if (!szId.IsEmpty())
-			m_users.insert(new FacebookUser(_atoi64(szId), cc, isChatRoom(cc)));
-	}
-
 	// Default group
 	Clist_GroupCreate(0, m_wszDefaultGroup);
 }
diff --git a/protocols/Facebook/src/proto.h b/protocols/Facebook/src/proto.h
index fe11debae7..d82cc80335 100644
--- a/protocols/Facebook/src/proto.h
+++ b/protocols/Facebook/src/proto.h
@@ -522,9 +522,10 @@ public:
 	////////////////////////////////////////////////////////////////////////////////////////
 	// PROTO_INTERFACE
 
-	void OnContactAdded(MCONTACT) override;
-	void OnModulesLoaded() override;
-	void OnShutdown() override;
+	void     OnCacheInit() override;
+	void     OnContactAdded(MCONTACT) override;
+	void     OnModulesLoaded() override;
+	void     OnShutdown() override;
 
 	MCONTACT AddToList(int flags, PROTOSEARCHRESULT *psr) override;
 	INT_PTR  GetCaps(int type, MCONTACT hContact) override;
-- 
cgit v1.2.3