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/WhatsApp/src/proto.cpp | 28 +++++++++++++---------------
 protocols/WhatsApp/src/proto.h   |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'protocols/WhatsApp')

diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index 38071deaf6..2dafb64065 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -136,32 +136,30 @@ void WhatsAppProto::RemoveCachedSettings()
 	m_szJid.Empty();
 }
 
-void WhatsAppProto::OnErase()
-{
-	m_bUnregister = true;
-	ServerThreadWorker();
-
-	RemoveCachedSettings();
-
-	DeleteDirectoryTreeW(CMStringW(VARSW(L"%miranda_userdata%")) + L"\\" + _A2T(m_szModuleName), false);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// OnModulesLoaded emulator for an account
-
-void WhatsAppProto::OnModulesLoaded()
+void WhatsAppProto::OnCacheInit()
 {
-	// initialize contacts cache
 	if (!m_szJid.IsEmpty())
 		m_arUsers.insert(new WAUser(0, m_szJid, false));
 
 	for (auto &cc : AccContacts()) {
+		m_bCacheInited = true;
+
 		CMStringA szId(getMStringA(cc, DBKEY_ID));
 		if (!szId.IsEmpty())
 			m_arUsers.insert(new WAUser(cc, szId, isChatRoom(cc)));
 	}
 }
 
+void WhatsAppProto::OnErase()
+{
+	m_bUnregister = true;
+	ServerThreadWorker();
+
+	RemoveCachedSettings();
+
+	DeleteDirectoryTreeW(CMStringW(VARSW(L"%miranda_userdata%")) + L"\\" + _A2T(m_szModuleName), false);
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////
 // PROTO_INTERFACE implementation
 
diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h
index c85bd73088..8d3ebf94cb 100644
--- a/protocols/WhatsApp/src/proto.h
+++ b/protocols/WhatsApp/src/proto.h
@@ -472,9 +472,9 @@ public:
 	int      SetStatus(int iNewStatus) override;
 	int      UserIsTyping(MCONTACT hContact, int type) override;
 
+	void     OnCacheInit() override;
 	MWindow  OnCreateAccMgrUI(MWindow) override;
 	void     OnErase() override;
-	void     OnModulesLoaded() override;
 
 	// Events //////////////////////////////////////////////////////////////////////////////
 
-- 
cgit v1.2.3