Call saveAsPrevious even if mod, to avoid triggering sticky key

7 years ago · c44d80feef
parent 71dce27a48
commit c44d80feef
1 changed files with 6 additions and 4 deletions
--- a/src/Kaleidoscope/OneShot.cpp
+++ b/src/Kaleidoscope/OneShot.cpp
@ -151,12 +151,14 @@ Key OneShot::eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_st

  // ordinary key here, with some event

-  if (keyIsPressed(key_state) && !isModifier(mapped_key)) {
+  if (keyIsPressed(key_state)) {
+    saveAsPrevious(mapped_key);
+    if (!isModifier(mapped_key)) {
      if (should_mask_on_interrupt_)
        KeyboardHardware.maskKey(row, col);
-    saveAsPrevious(mapped_key);
      should_cancel_ = true;
    }
+  }

  return mapped_key;
 }