Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix combo enabling logic #5610

Merged
merged 1 commit into from
Apr 14, 2019
Merged

Conversation

rsheldiii
Copy link
Contributor

Description

I botched the merge conflict resolution in #2561 , inverting the logic for when combos should be re-enabled. This PR fixes #5595 that came as a result; on master with combos I can reproduce stuck keys and swallowed keypresses when using SEND_KEYS() but with these changes I cannot. It'd be great if @noahfrederick could confirm!

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@noahfrederick
Copy link
Contributor

👍 This fixes #5595 for me.

@drashna
Copy link
Member

drashna commented Apr 14, 2019

Thanks!

@drashna drashna merged commit 02b74d5 into qmk:master Apr 14, 2019
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request Apr 17, 2019
shimesaba-type0 pushed a commit to shimesaba-type0/qmk_firmware that referenced this pull request Jun 22, 2019
Timbus pushed a commit to Timbus/qmk_firmware that referenced this pull request Jun 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Combo feature intermittently skips keystrokes
3 participants