From 8bd59593912495db8b41f885c1c9c8c5687e4156 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 31 May 2018 12:24:51 +0300
Subject: fixes #1397 (StdMsg: dynamic loading breaks meta menu)

---
 src/core/stdmsg/src/msgs.cpp       |  2 --
 src/core/stdmsg/src/statusicon.cpp | 10 +---------
 src/core/stdmsg/src/statusicon.h   |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 869d679855..cdadeba179 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -479,8 +479,6 @@ static int SplitmsgModulesLoaded(WPARAM, LPARAM)
 int PreshutdownSendRecv(WPARAM, LPARAM)
 {
 	Srmm_Broadcast(DM_CLOSETAB, 0, 0);
-
-	DeinitStatusIcons();
 	return 0;
 }
 
diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp
index 76509152cc..0246d2a762 100644
--- a/src/core/stdmsg/src/statusicon.cpp
+++ b/src/core/stdmsg/src/statusicon.cpp
@@ -67,20 +67,12 @@ void CheckStatusIconClick(MCONTACT hContact, HWND hwndFrom, POINT pt, const RECT
 	sicd.dwId = sid->dwId;
 	sicd.szModule = sid->szModule;
 	sicd.flags = click_flags;
-	NotifyEventHooks(hHookIconPressedEvt, hContact, (LPARAM)&sicd);
+	Srmm_ClickStatusIcon(hContact, &sicd);
 }
 
 int InitStatusIcons()
 {
 	HookEvent(ME_MSG_ICONSCHANGED, OnSrmmIconChanged);
-
-	hHookIconPressedEvt = CreateHookableEvent(ME_MSG_ICONPRESSED);
-	return 0;
-}
-
-int DeinitStatusIcons()
-{
-	DestroyHookableEvent(hHookIconPressedEvt);
 	return 0;
 }
 
diff --git a/src/core/stdmsg/src/statusicon.h b/src/core/stdmsg/src/statusicon.h
index 8a267917dc..209e411671 100644
--- a/src/core/stdmsg/src/statusicon.h
+++ b/src/core/stdmsg/src/statusicon.h
@@ -5,7 +5,6 @@ extern HANDLE hHookIconPressedEvt;
 extern int status_icon_list_size;
 
 int InitStatusIcons();
-int DeinitStatusIcons();
 
 int  GetStatusIconsCount(MCONTACT hContact);
 void DrawStatusIcons(MCONTACT hContact, HDC hdc, const RECT &rc, int gap);
-- 
cgit v1.2.3