From 6ba39da289306e1a1db3ee122add5f2dbc4aaee4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 19 Jan 2021 22:14:44 +0300
Subject: fixes #2693 (import in the service mode breaks the groups' order)

---
 protocols/Facebook/src/proto.cpp | 6 +++---
 src/mir_app/src/miranda.cpp      | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/protocols/Facebook/src/proto.cpp b/protocols/Facebook/src/proto.cpp
index 1650e31619..bfb6f9e71a 100644
--- a/protocols/Facebook/src/proto.cpp
+++ b/protocols/Facebook/src/proto.cpp
@@ -116,9 +116,6 @@ FacebookProto::FacebookProto(const char *proto_name, const wchar_t *username) :
 	HookProtoEvent(ME_OPT_INITIALISE, &FacebookProto::OnOptionsInit);
 	HookProtoEvent(ME_DB_EVENT_MARKED_READ, &FacebookProto::OnMarkedRead);
 
-	// Default group
-	Clist_GroupCreate(0, m_wszDefaultGroup);
-
 	// Group chats
 	GCREGISTER gcr = {};
 	gcr.dwFlags = GC_TYPNOTIF;
@@ -142,6 +139,9 @@ void FacebookProto::OnModulesLoaded()
 	wszPath.Format(L"%s\\%S\\Stickers\\*.webp", wszCache.get(), m_szModuleName);
 	cont.path = wszPath;
 	CallService(MS_SMILEYADD_LOADCONTACTSMILEYS, 0, LPARAM(&cont));
+
+	// Default group
+	Clist_GroupCreate(0, m_wszDefaultGroup);
 }
 
 void FacebookProto::OnShutdown()
diff --git a/src/mir_app/src/miranda.cpp b/src/mir_app/src/miranda.cpp
index 8bd2e4ee28..38909e4202 100644
--- a/src/mir_app/src/miranda.cpp
+++ b/src/mir_app/src/miranda.cpp
@@ -352,8 +352,11 @@ int WINAPI mir_main(LPTSTR cmdLine)
 	}
 	else {
 		InitPathVar();
-		NotifyEventHooks(hModulesLoadedEvent, 0, 0);
-		g_bModulesLoadedFired = true;
+
+		if (plugin_service == nullptr) {
+			NotifyEventHooks(hModulesLoadedEvent, 0, 0);
+			g_bModulesLoadedFired = true;
+		}
 
 		// ensure that the kernel hooks the SystemShutdownProc() after all plugins
 		HookEvent(ME_SYSTEM_SHUTDOWN, SystemShutdownProc);
-- 
cgit v1.2.3