From 53291bd6ff2e14fd6a3053e5e252571140c8934e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 21 Feb 2013 11:12:06 +0000 Subject: MS_SYSTEM_MODULEUNLOAD should be called after calling Unload, but before the physical dll unload git-svn-id: http://svn.miranda-ng.org/main/trunk@3666 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/plugins/newplugins.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules') diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 7ce226db19..1800080c82 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -347,8 +347,6 @@ int Plugin_UnloadDyn(pluginEntry* p) if ( CallPluginEventHook(p->bpi.hInst, hOkToExitEvent, 0, 0) != 0) return FALSE; - NotifyEventHooks(hevUnloadModule, (WPARAM)p->bpi.pluginInfo, (LPARAM)p->bpi.hInst); - CallPluginEventHook(p->bpi.hInst, hPreShutdownEvent, 0, 0); CallPluginEventHook(p->bpi.hInst, hShutdownEvent, 0, 0); } @@ -365,6 +363,8 @@ int Plugin_UnloadDyn(pluginEntry* p) KillModuleExtraIcons(hLangpack); } + NotifyEventHooks(hevUnloadModule, (WPARAM)p->bpi.pluginInfo, (LPARAM)p->bpi.hInst); + Plugin_Uninit(p); // load default plugins instead of the unloaded one -- cgit v1.2.3