diff options
author | attila-csipa <attila.csipa@hp.com> | 2017-07-07 13:16:16 +0100 |
---|---|---|
committer | attila-csipa <attila.csipa@hp.com> | 2017-07-07 13:16:16 +0100 |
commit | 5ded46a80ec82137869ebd234189b1fd9ffff680 (patch) | |
tree | feac22663567716e51133734d7592da64adfd239 /dinput | |
parent | 816c857c513e42a0b2583c2ab7bd89610f968f93 (diff) | |
parent | f013741288cbbd9a2e70aea727cbb80cf72d10cc (diff) |
Merge remote-tracking branch 'upstream/unstable' into unstable
Diffstat (limited to 'dinput')
-rw-r--r-- | dinput/keybinding-worker.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dinput/keybinding-worker.cpp b/dinput/keybinding-worker.cpp index 41fa3486..042f01a5 100644 --- a/dinput/keybinding-worker.cpp +++ b/dinput/keybinding-worker.cpp @@ -142,6 +142,8 @@ void KeybindingWorker::run() case DIK_RCONTROL: case DIK_RSHIFT: case DIK_RALT: + case DIK_LWIN: + case DIK_RWIN: break; default: k.shift = !!((keystate[DIK_LSHIFT] & 0x80) || (keystate[DIK_RSHIFT] & 0x80)); |