From 5d55c351109d18bb46b97c7e6142f6f321595849 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 12 Aug 2014 20:36:33 +0000 Subject: icons registration moved to Load() git-svn-id: http://svn.miranda-ng.org/main/trunk@10173 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MenuItemEx/src/main.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/MenuItemEx/src') diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 702a585406..337237a28a 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -964,9 +964,6 @@ static int PluginInit(WPARAM wparam, LPARAM lparam) { int pos = 1000, i = 0; - Icon_Register(hinstance, LPGEN("MenuItemEx"), iconList, SIZEOF(iconList)); - Icon_Register(hinstance, LPGEN("MenuItemEx"), overlayIconList, SIZEOF(overlayIconList)); - CreateServiceFunction(MS_SETINVIS, onSetInvis); CreateServiceFunction(MS_SETVIS, onSetVis); CreateServiceFunction(MS_HIDE, onHide); @@ -1096,6 +1093,10 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda extern "C" __declspec(dllexport) int Load(void) { mir_getLP(&pluginInfoEx); + + Icon_Register(hinstance, LPGEN("MenuItemEx"), iconList, SIZEOF(iconList)); + Icon_Register(hinstance, LPGEN("MenuItemEx"), overlayIconList, SIZEOF(overlayIconList)); + HookEvent(ME_SYSTEM_MODULESLOADED, PluginInit); HookEvent(ME_SYSTEM_MODULELOAD, ModuleLoad); HookEvent(ME_SYSTEM_MODULEUNLOAD, ModuleLoad); -- cgit v1.2.3