diff options
| author | Attila Csipa <git@csipa.net> | 2017-07-07 13:16:16 +0100 |
|---|---|---|
| committer | Attila Csipa <git@csipa.net> | 2017-07-07 13:16:16 +0100 |
| commit | 89b3621079aebc04b32892b01040397044c21bf4 (patch) | |
| tree | feac22663567716e51133734d7592da64adfd239 /dinput/keybinding-worker.cpp | |
| parent | b8272dabb295ff8c92cde01d8a3170aae9b180a6 (diff) | |
| parent | f013741288cbbd9a2e70aea727cbb80cf72d10cc (diff) | |
Merge remote-tracking branch 'upstream/unstable' into unstable
Diffstat (limited to 'dinput/keybinding-worker.cpp')
| -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)); |