summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-07-06 06:07:11 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-07-06 06:07:11 +0000
commit7a488944494b8a4e1d13d2591de7751bc3aa5045 (patch)
treed367ac4ed1018d6af46e5fe6fd279a116c1b4946
parent488aa433f119560b13c1b6234508ea6dda29c25a (diff)
event handle to return on duplicate event registration
git-svn-id: http://svn.miranda-ng.org/main/trunk@782 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/Mir_core/modules.cpp2
-rw-r--r--src/core/stduserinfo/main.cpp5
2 files changed, 1 insertions, 6 deletions
diff --git a/plugins/Mir_core/modules.cpp b/plugins/Mir_core/modules.cpp
index 88dd79a138..f87c7bb192 100644
--- a/plugins/Mir_core/modules.cpp
+++ b/plugins/Mir_core/modules.cpp
@@ -106,7 +106,7 @@ MIR_CORE_DLL(HANDLE) CreateHookableEvent(const char *name)
int idx;
if ((idx = hooks.getIndex((THook*)name)) != -1)
- return NULL;
+ return hooks[idx];
THook* newItem = (THook*)mir_alloc(sizeof(THook));
strncpy(newItem->name, name, sizeof(newItem->name)); newItem->name[ MAXMODULELABELLENGTH-1 ] = 0;
diff --git a/src/core/stduserinfo/main.cpp b/src/core/stduserinfo/main.cpp
index 22420f0fa3..594f5ba805 100644
--- a/src/core/stduserinfo/main.cpp
+++ b/src/core/stduserinfo/main.cpp
@@ -62,11 +62,6 @@ extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
return interfaces;
}
-static int OnModulesLoaded(WPARAM, LPARAM)
-{
- return 0;
-}
-
extern "C" int __declspec(dllexport) Load(void)
{
mir_getLP(&pluginInfo);