From ca7197e8812b188a99fc72b524f936e06e08327a Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 30 Jun 2012 18:22:58 +0000
Subject: fix for the default hook handlers

git-svn-id: http://svn.miranda-ng.org/main/trunk@703 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Mir_core/modules.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'plugins/Mir_core/modules.cpp')

diff --git a/plugins/Mir_core/modules.cpp b/plugins/Mir_core/modules.cpp
index 121ed1282b..61e7344676 100644
--- a/plugins/Mir_core/modules.cpp
+++ b/plugins/Mir_core/modules.cpp
@@ -213,12 +213,14 @@ MIR_CORE_DLL(int) CallHookSubscribers(HANDLE hEvent, WPARAM wParam, LPARAM lPara
 			case 5:	returnVal = SendMessage(s->hwnd, s->message, wParam, lParam); break;
 			default: continue;
 		}
-		if (returnVal)
-			break;
+		if (returnVal) {
+			LeaveCriticalSection(&p->csHook);
+			return returnVal;
+		}
 	}
 
-	// check for no hooks and call the default hook if any
-	if (p->subscriberCount == 0 && p->pfnHook != 0)
+	// call the default hook if any
+	if (p->pfnHook != 0)
 		returnVal = p->pfnHook(wParam, lParam);
 
 	LeaveCriticalSection(&p->csHook);
-- 
cgit v1.2.3