summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-01 18:18:36 +0200
committerGitHub <noreply@github.com>2017-06-01 18:18:36 +0200
commitd548693c8be93792605c413d7258aeeb0dcc4f34 (patch)
tree6f158d763086ebceded8890264febef9fdf8087c
parentec3e684123c5abf22fd8d397786adbd978bbfcdb (diff)
parent606e13a47ea3f4099e09c0a71294555163790c4a (diff)
downloadqmk_firmware-d548693c8be93792605c413d7258aeeb0dcc4f34.tar.gz
qmk_firmware-d548693c8be93792605c413d7258aeeb0dcc4f34.tar.xz
Merge pull request #1294 from shieldsd/master
Prevent the recording of looping dynamic macros.
-rw-r--r--quantum/dynamic_macro.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/quantum/dynamic_macro.h b/quantum/dynamic_macro.h
index f242405de..045ee95b5 100644
--- a/quantum/dynamic_macro.h
+++ b/quantum/dynamic_macro.h
@@ -274,6 +274,10 @@ bool process_record_dynamic_macro(uint16_t keycode, keyrecord_t *record)
macro_id = 0;
}
return false;
+ case DYN_MACRO_PLAY1:
+ case DYN_MACRO_PLAY2:
+ dprintln("dynamic macro: ignoring macro play key while recording");
+ return false;
default:
/* Store the key in the macro buffer and process it normally. */
switch (macro_id) {