From: U-i7\gimy Date: Sun, 13 Sep 2009 14:45:35 +0000 (+0900) Subject: through scancode hooked by WH_KEYBOARD_LL, if yamy is disable. this fix ticket #18691. X-Git-Tag: v0.03~4 X-Git-Url: http://git.osdn.net/view?p=yamy%2Fyamy.git;a=commitdiff_plain;h=b0c19d643b2744808d6af98f329dc99893cc23d4 through scancode hooked by WH_KEYBOARD_LL, if yamy is disable. this fix ticket #18691. --- diff --git a/engine.cpp b/engine.cpp index 490fa76..e5085d5 100644 --- a/engine.cpp +++ b/engine.cpp @@ -763,7 +763,7 @@ unsigned int Engine::keyboardDetour(KBDLLHOOKSTRUCT *i_kid) << _T(" scanCode=") << i_kid->scanCode << _T(" flags=") << i_kid->flags << std::endl; #endif - if (i_kid->flags & LLKHF_INJECTED) { + if ((i_kid->flags & LLKHF_INJECTED) || !m_isEnabled) { return 0; } else { Key key; @@ -796,7 +796,7 @@ unsigned int WINAPI Engine::mouseDetour(Engine *i_this, WPARAM i_wParam, LPARAM unsigned int Engine::mouseDetour(WPARAM i_message, MSLLHOOKSTRUCT *i_mid) { - if (i_mid->flags & LLMHF_INJECTED || !m_setting || !m_setting->m_mouseEvent) { + if (i_mid->flags & LLMHF_INJECTED || !m_isEnabled || !m_setting || !m_setting->m_mouseEvent) { return 0; } else { KEYBOARD_INPUT_DATA kid;