diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-06-01 12:18:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 12:18:36 -0400 |
| commit | d548693c8be93792605c413d7258aeeb0dcc4f34 (patch) | |
| tree | 6f158d763086ebceded8890264febef9fdf8087c | |
| parent | ec3e684123c5abf22fd8d397786adbd978bbfcdb (diff) | |
| parent | 606e13a47ea3f4099e09c0a71294555163790c4a (diff) | |
| download | qmk_firmware-d548693c8be93792605c413d7258aeeb0dcc4f34.tar.gz qmk_firmware-d548693c8be93792605c413d7258aeeb0dcc4f34.zip | |
Merge pull request #1294 from shieldsd/master
Prevent the recording of looping dynamic macros.
| -rw-r--r-- | quantum/dynamic_macro.h | 4 |
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) | |||
| 274 | macro_id = 0; | 274 | macro_id = 0; |
| 275 | } | 275 | } |
| 276 | return false; | 276 | return false; |
| 277 | case DYN_MACRO_PLAY1: | ||
| 278 | case DYN_MACRO_PLAY2: | ||
| 279 | dprintln("dynamic macro: ignoring macro play key while recording"); | ||
| 280 | return false; | ||
| 277 | default: | 281 | default: |
| 278 | /* Store the key in the macro buffer and process it normally. */ | 282 | /* Store the key in the macro buffer and process it normally. */ |
| 279 | switch (macro_id) { | 283 | switch (macro_id) { |
