From 09bce81d5eae2a46dd039e9fa14290c77685d637 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 6 Dec 2017 20:06:44 +0300
Subject: fixes #1054 (StatusManager cannot enable/disable modules "on the
 fly")

---
 plugins/StatusManager/src/commonstatus.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'plugins/StatusManager/src/commonstatus.cpp')

diff --git a/plugins/StatusManager/src/commonstatus.cpp b/plugins/StatusManager/src/commonstatus.cpp
index 146b69a96d..fe1860ecb3 100644
--- a/plugins/StatusManager/src/commonstatus.cpp
+++ b/plugins/StatusManager/src/commonstatus.cpp
@@ -30,8 +30,6 @@ OBJLIST<PROTOCOLSETTINGEX> *protoList;
 char* StatusModeToDbSetting(int status, const char *suffix);
 DWORD StatusModeToProtoFlag(int status);
 INT_PTR SetStatusEx(WPARAM wParam, LPARAM lParam);
-int InitCommonStatus();
-int GetProtoCount();
 
 // some helpers from awaymsg.c ================================================================
 char *StatusModeToDbSetting(int status, const char *suffix)
@@ -251,16 +249,6 @@ INT_PTR SetStatusEx(WPARAM wParam, LPARAM)
 }
 
 static INT_PTR GetProtocolCountService(WPARAM, LPARAM)
-{
-	return GetProtoCount();
-}
-
-bool IsSuitableProto(PROTOACCOUNT *pa)
-{
-	return (pa == nullptr) ? false : (pcli->pfnGetProtocolVisibility(pa->szModuleName) != 0);
-}
-
-int GetProtoCount()
 {
 	int pCount = 0, count;
 	PROTOACCOUNT **accs;
@@ -273,6 +261,11 @@ int GetProtoCount()
 	return pCount;
 }
 
+bool IsSuitableProto(PROTOACCOUNT *pa)
+{
+	return (pa == nullptr) ? false : (pcli->pfnGetProtocolVisibility(pa->szModuleName) != 0);
+}
+
 static int CreateServices()
 {
 	if (ServiceExists(MS_CS_SETSTATUSEX))
@@ -287,6 +280,7 @@ static int CreateServices()
 
 static int onShutdown(WPARAM, LPARAM)
 {
+	g_bMirandaLoaded = false;
 	DestroyHookableEvent(hCSStatusChangedExEvent);
 	return 0;
 }
-- 
cgit v1.2.3