OSDN Git Service

through scancode hooked by WH_KEYBOARD_LL, if yamy is disable. this fix ticket #18691.
authorU-i7\gimy <gimy@users.sourceforge.jp>
Sun, 13 Sep 2009 14:45:35 +0000 (23:45 +0900)
committerU-i7\gimy <gimy@users.sourceforge.jp>
Sun, 13 Sep 2009 14:45:35 +0000 (23:45 +0900)
engine.cpp

index 490fa76..e5085d5 100644 (file)
@@ -763,7 +763,7 @@ unsigned int Engine::keyboardDetour(KBDLLHOOKSTRUCT *i_kid)
        << _T(" scanCode=") << i_kid->scanCode\r
        << _T(" flags=") << i_kid->flags << std::endl;\r
 #endif\r
-       if (i_kid->flags & LLKHF_INJECTED) {\r
+       if ((i_kid->flags & LLKHF_INJECTED) || !m_isEnabled) {\r
                return 0;\r
        } else {\r
                Key key;\r
@@ -796,7 +796,7 @@ unsigned int WINAPI Engine::mouseDetour(Engine *i_this, WPARAM i_wParam, LPARAM
 \r
 unsigned int Engine::mouseDetour(WPARAM i_message, MSLLHOOKSTRUCT *i_mid)\r
 {\r
-       if (i_mid->flags & LLMHF_INJECTED || !m_setting || !m_setting->m_mouseEvent) {\r
+       if (i_mid->flags & LLMHF_INJECTED || !m_isEnabled || !m_setting || !m_setting->m_mouseEvent) {\r
                return 0;\r
        } else {\r
                KEYBOARD_INPUT_DATA kid;\r