# HG changeset patch # User yexo # Date 2011-02-25 13:59:02 # Node ID e013a98ab0365c4072cf6315d6d2a63cb2d65fa0 # Parent d913e96c05b0d8fe4839509a4749ed18f851dbeb (svn r22142) -Fix (r22094): some valid keycodes were ignored along with the invalid ones diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp --- a/src/hotkeys.cpp +++ b/src/hotkeys.cpp @@ -74,7 +74,8 @@ static uint16 ParseCode(const char *star } if (end - start == 1) { if (*start >= 'a' && *start <= 'z') return *start - ('a'-'A'); - return *start; + /* Ignore invalid keycodes */ + if (*(uint8*)start < 128) return *start; } return 0; } @@ -99,10 +100,6 @@ static uint16 ParseKeycode(const char *s if (code & ~WKC_SPECIAL_KEYS) return 0; keycode |= code; } else { - /* Ignore invalid keycodes */ - if (code >= 128) { - return 0; - } /* Ignore the code if it has more then 1 letter. */ if (keycode & ~WKC_SPECIAL_KEYS) return 0; keycode |= code;