aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-04-12 10:04:19 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-04-13 16:00:29 +0300
commit07fc34e962a54f87802f11e9e30ed5891325f07e (patch)
tree49283b57460a0f8dea000327eaa3705d5a47145e /tmk_core
parentabda6ff7bbe00792c0ed7edea4a31b9dec6c13e8 (diff)
downloadqmk_firmware-07fc34e962a54f87802f11e9e30ed5891325f07e.tar.gz
qmk_firmware-07fc34e962a54f87802f11e9e30ed5891325f07e.zip
Fix warnings when ACTION_ONESHOT is disabled
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 94de36918..4ba1cc251 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -140,7 +140,6 @@ void process_record(keyrecord_t *record)
140 140
141void process_action(keyrecord_t *record, action_t action) 141void process_action(keyrecord_t *record, action_t action)
142{ 142{
143 bool do_release_oneshot = false;
144 keyevent_t event = record->event; 143 keyevent_t event = record->event;
145#ifndef NO_ACTION_TAPPING 144#ifndef NO_ACTION_TAPPING
146 uint8_t tap_count = record->tap.count; 145 uint8_t tap_count = record->tap.count;
@@ -152,6 +151,7 @@ void process_action(keyrecord_t *record, action_t action)
152 } 151 }
153 152
154#ifndef NO_ACTION_ONESHOT 153#ifndef NO_ACTION_ONESHOT
154 bool do_release_oneshot = false;
155 // notice we only clear the one shot layer if the pressed key is not a modifier. 155 // notice we only clear the one shot layer if the pressed key is not a modifier.
156 if (is_oneshot_layer_active() && event.pressed && !IS_MOD(action.key.code)) { 156 if (is_oneshot_layer_active() && event.pressed && !IS_MOD(action.key.code)) {
157 clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); 157 clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);