diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-08-17 21:16:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-17 21:16:49 -0400 |
| commit | 39a95897bcb5f7b1a9b05c8ade416e7c9566857a (patch) | |
| tree | 0ba6f7d6cdebdb7c2e8f7a1528667c711753829f | |
| parent | f4f80a0e3ac24f573ce72fea88e291e94108b9d8 (diff) | |
| parent | 644c8c79271db8cf1bd934b9a80a0215585e46e7 (diff) | |
| download | qmk_firmware-39a95897bcb5f7b1a9b05c8ade416e7c9566857a.tar.gz qmk_firmware-39a95897bcb5f7b1a9b05c8ade416e7c9566857a.zip | |
Merge pull request #647 from Vifon/process_record_nocache-fix
Fix the process_record_nocache function
| -rw-r--r-- | quantum/quantum.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index a4c5c2ddb..cb1ba04ff 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -46,18 +46,20 @@ bool process_record_quantum(keyrecord_t *record) { | |||
| 46 | uint16_t keycode; | 46 | uint16_t keycode; |
| 47 | 47 | ||
| 48 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) | 48 | #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) |
| 49 | uint8_t layer; | 49 | /* TODO: Use store_or_get_action() or a similar function. */ |
| 50 | if (!disable_action_cache) { | ||
| 51 | uint8_t layer; | ||
| 50 | 52 | ||
| 51 | if (record->event.pressed) { | 53 | if (record->event.pressed) { |
| 52 | layer = layer_switch_get_layer(key); | 54 | layer = layer_switch_get_layer(key); |
| 53 | update_source_layers_cache(key, layer); | 55 | update_source_layers_cache(key, layer); |
| 54 | } else { | 56 | } else { |
| 55 | layer = read_source_layers_cache(key); | 57 | layer = read_source_layers_cache(key); |
| 56 | } | 58 | } |
| 57 | keycode = keymap_key_to_keycode(layer, key); | 59 | keycode = keymap_key_to_keycode(layer, key); |
| 58 | #else | 60 | } else |
| 59 | keycode = keymap_key_to_keycode(layer_switch_get_layer(key), key); | ||
| 60 | #endif | 61 | #endif |
| 62 | keycode = keymap_key_to_keycode(layer_switch_get_layer(key), key); | ||
| 61 | 63 | ||
| 62 | // This is how you use actions here | 64 | // This is how you use actions here |
| 63 | // if (keycode == KC_LEAD) { | 65 | // if (keycode == KC_LEAD) { |