Restore shortcuts after user session switches - #1797
Open
culpen90 wants to merge 2 commits into
Open
Conversation
culpen90
marked this pull request as ready for review
July 22, 2026 14:17
Owner
|
Thanks! Sorry for the delay on reviewing this one. Looks good, but a merge conflict popped up from a different PR that was merged. I'll have some time to untangle it this week if you don't have a chance to get to it. |
Contributor
Author
|
Thanks — I resolved the conflict by merging the current |
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
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.
Summary
Root cause
MASShortcut retains the configured shortcut even when Carbon cannot register the corresponding global hotkey. With multiple logged-in user sessions, an inactive Rectangle process could keep those hotkeys registered, leaving the active user's shortcuts configured but nonfunctional.
Testing
xcodebuild test -quiet -project Rectangle.xcodeproj -scheme Rectangle -destination 'platform=macOS' -derivedDataPath /private/tmp/RectangleIssue351Conflict.X4sF3k -only-testing:RectangleTests/ShortcutManagerSessionTests -only-testing:RectangleTests/ShortcutRecordingObserverTests CODE_SIGNING_ALLOWED=NO(15 tests passed)8db3e8eFixes #351