fix(macos): drop key writes when DriverKit sink is disconnected#2013
Merged
jtroo merged 1 commit intojtroo:mainfrom Apr 9, 2026
Merged
fix(macos): drop key writes when DriverKit sink is disconnected#2013jtroo merged 1 commit intojtroo:mainfrom
jtroo merged 1 commit intojtroo:mainfrom
Conversation
Closes jtroo#2008 After wake-from-sleep on macOS, the DriverKit virtual keyboard sink briefly disconnects The event loop in src/kanata/macos.rs already recovers gracefully (release input, wait for output_ready, regrab), but the processing thread runs in parallel and can race ahead with a write before the event loop notices. That write returned NotConnected, which propagated through handle_keys as bail! and panicked the processing loop Treat NotConnected from KbdOut::write_key / KbdOut::write_code as a non-fatal drop with a warning, mirroring the existing "log warn on sink disconnect" pattern used by event_loop. The event loop's output_ready() poll at the top of every iteration remains the authoritative recovery trigger
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Describe your changes. Use imperative present tense.
Closes #2008
After wake-from-sleep on macOS, the DriverKit virtual keyboard sink briefly disconnects
The event loop in src/kanata/macos.rs already recovers gracefully (release input, wait for output_ready, regrab), but the processing thread runs in parallel and can race ahead with a write before the event loop notices. That write returned NotConnected, which propagated through handle_keys as bail! and panicked the processing loop
Treat NotConnected from KbdOut::write_key / KbdOut::write_code as a non-fatal drop with a warning, mirroring the existing "log warn on sink disconnect" pattern used by event_loop. The event loop's output_ready() poll at the top of every iteration remains the authoritative recovery trigger
Checklist