summary refs log tree commit diff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorErez Zukerman <ezuk@madmimi.com>2015-10-28 04:19:13 +0200
committerErez Zukerman <ezuk@madmimi.com>2015-10-28 04:19:13 +0200
commitf024a462cdaa4a7a345160819bdf2d01fbabc97a (patch)
tree238c278b201ebed69c69c4dc8f07829966cf9b15 /tmk_core/common
parentd3db8d62f6fc6a7dee43978ddc8356579b502b37 (diff)
Fixes rolling combos for mod-tap keys
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/action.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index 1f15bd0918..77ea39e942 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -142,12 +142,15 @@ void process_action(keyrecord_t *record)
                     default:
                         if (event.pressed) {
                             if (tap_count > 0) {
+#ifndef IGNORE_MOD_TAP_INTERRUPT
                                 if (record->tap.interrupted) {
-                                    dprint("MODS_TAP: Tap: Cancel: add_mods\n");
+                                    dprint("mods_tap: tap: cancel: add_mods\n");
                                     // ad hoc: set 0 to cancel tap
                                     record->tap.count = 0;
                                     register_mods(mods);
-                                } else {
+                                } else
+#endif
+                                {
                                     dprint("MODS_TAP: Tap: register_code\n");
                                     register_code(action.key.code);
                                 }
@@ -397,7 +400,7 @@ void register_code(uint8_t code)
             set_mods(tmp_mods);
             send_keyboard_report();
             oneshot_cancel();
-        } else 
+        } else
 */
 #endif
         {