aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/planck/keymaps/vifon/keymap.c
diff options
context:
space:
mode:
authorjpetermans <tibcmhhm@gmail.com>2017-05-24 11:51:20 -0700
committerjpetermans <tibcmhhm@gmail.com>2017-05-24 11:51:20 -0700
commit2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7 (patch)
tree289d5cce94ad5883741f0b637749d87680c14d33 /keyboards/planck/keymaps/vifon/keymap.c
parentd89114400c398b900e27bf324a7973d1e0f25e58 (diff)
parent7a4ec3bd926865e490fbf7c5ec68d762e998683f (diff)
downloadfirmware-2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7.tar.gz
firmware-2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7.tar.bz2
firmware-2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7.zip
Merge remote-tracking branch 'upstream/master' into infinity60
Diffstat (limited to 'keyboards/planck/keymaps/vifon/keymap.c')
-rw-r--r--keyboards/planck/keymaps/vifon/keymap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/keyboards/planck/keymaps/vifon/keymap.c b/keyboards/planck/keymaps/vifon/keymap.c
index ee0c0ac36..ecd5c2cc4 100644
--- a/keyboards/planck/keymaps/vifon/keymap.c
+++ b/keyboards/planck/keymaps/vifon/keymap.c
@@ -107,7 +107,8 @@ const uint16_t PROGMEM fn_actions[] = {
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
static uint16_t key_timer;
- if (!process_record_dynamic_macro(keycode, record)) {
+ uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode);
+ if (!process_record_dynamic_macro(macro_kc, record)) {
return false;
}