aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2016-01-04 17:57:04 -0500
committerDrew DeVault <sir@cmpwn.com>2016-01-04 17:57:04 -0500
commitf9b92783c5d8e20273acf7865f628d988249d7a2 (patch)
tree24599ce18f690df7dc15390608c530ecb919f1ff
parent27ab7d898219ff9a5aa2126d9f4ea9ee82403254 (diff)
parente62c49f83cd9de0343ce7e71db1b2446d11bb22e (diff)
downloadsway-f9b92783c5d8e20273acf7865f628d988249d7a2.tar.xz
Merge pull request #432 from mikkeloscar/fix-sway-multikey
Fix overwriting current pressed keys.
-rw-r--r--sway/input_state.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/input_state.c b/sway/input_state.c
index 25308a77..58619d1f 100644
--- a/sway/input_state.c
+++ b/sway/input_state.c
@@ -36,8 +36,8 @@ static uint8_t find_key(uint32_t key_sym, uint32_t key_code, bool update) {
if (0 == key_sym && 0 == key_code && key_state_array[i].key_sym == 0) {
break;
}
- if (key_state_array[i].key_sym == key_sym
- || key_state_array[i].alt_sym == key_sym) {
+ if (key_sym != 0 && (key_state_array[i].key_sym == key_sym
+ || key_state_array[i].alt_sym == key_sym)) {
break;
}
if (update && key_state_array[i].key_code == key_code) {