summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-09-28 11:21:32 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-09-28 11:21:32 +0000
commit30bd869d78ea7d67904e6fa46c205e3a8697c6fc (patch)
tree361f46f51f495f4b27a1122f1018bb0ff2e8f2f5 /src/modules
parentd4c7112ac94d71397957c2bab796167cc91532fd (diff)
fix for keyboard idle state interruption
git-svn-id: http://svn.miranda-ng.org/main/trunk@6256 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/skin/hotkeys.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/skin/hotkeys.cpp b/src/modules/skin/hotkeys.cpp
index fec07d812a..fc8ca86828 100644
--- a/src/modules/skin/hotkeys.cpp
+++ b/src/modules/skin/hotkeys.cpp
@@ -99,12 +99,13 @@ static LRESULT CALLBACK sttKeyboardProc(int code, WPARAM wParam, LPARAM lParam)
for (int i=0; i < hotkeys.getCount(); i++) {
THotkeyItem *item = hotkeys[i];
+ if (item->type != HKT_LOCAL || !item->Enabled)
+ continue;
+
BYTE hkMod, hkVk;
- if (item->type != HKT_LOCAL) continue;
sttWordToModAndVk(item->Hotkey, &hkMod, &hkVk);
- if ( !hkVk) continue;
- if ( !item->Enabled) continue;
- if (item->pszService && (vk == hkVk) && (mod == hkMod)) {
+ if (!hkVk) continue;
+ if (item->pszService && vk == hkVk && mod == hkMod) {
CallService(item->pszService, 0, item->lParam);
return TRUE;
} } } }