Skip to content

gpui_macos: Fix deadlock during re-entrant key status changes#51035

Merged
Anthony-Eid merged 1 commit intozed-industries:mainfrom
Dnreikronos:fix/popup-window-deadlock
Mar 17, 2026
Merged

gpui_macos: Fix deadlock during re-entrant key status changes#51035
Anthony-Eid merged 1 commit intozed-industries:mainfrom
Dnreikronos:fix/popup-window-deadlock

Conversation

@Dnreikronos
Copy link
Copy Markdown
Contributor

@Dnreikronos Dnreikronos commented Mar 8, 2026 •
edited by yeskunall
Loading

Closes #50151

Before you mark this PR as ready for review, make sure that you have:

  • Added a solid test coverage and/or screenshots from doing manual testing
  • Done a self-review taking into account security and performance aspects
  • Aligned any UI changes with the UI checklist

Release Notes:

  • Fixed a deadlock that froze the entire app when opening a new window from a PopUp window or switching focus between multiple windows on macOS.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Mar 8, 2026
This was referenced Mar 8, 2026
Closed
Closed
@mikayla-maki mikayla-maki requested a review from Anthony-Eid March 8, 2026 03:47
@hackerbirds
Copy link
Copy Markdown

hackerbirds commented Mar 9, 2026

I manually tested this on my Macbook, this fix worked for me (using the reproducer I made in #42821)

@Dnreikronos
Copy link
Copy Markdown
Contributor Author

Dnreikronos commented Mar 9, 2026

I manually tested this on my Macbook, this fix worked for me (using the reproducer I made in #42821)

That's awesome!!!
Thanks for your time invested, @hackerbirds!

@yeskunall yeskunall changed the title gpui_macos: Fix deadlock in window_did_change_key_status during re-entrant key status changes gpui_macos: Fix deadlock during re-entrant key status changes Mar 16, 2026
@Anthony-Eid Anthony-Eid merged commit 97049a7 into zed-industries:main Mar 17, 2026
32 checks passed
@Anthony-Eid
Copy link
Copy Markdown
Contributor

Anthony-Eid commented Mar 17, 2026

Thanks for fixing this!

marsam2489-lang added a commit to Plantapple16/zed that referenced this pull request Mar 17, 2026
@marsam2489-lang
Revert "gpui_macos: Fix deadlock during re-entrant key status changes (…
5adc708 
…zed-industries#51035)"

This reverts commit 97049a7.
@marsam2489-lang marsam2489-lang mentioned this pull request Mar 17, 2026
Closed
@hackerbirds
Copy link
Copy Markdown

hackerbirds commented Mar 18, 2026

Thank you very much for your work!

@Dnreikronos
Copy link
Copy Markdown
Contributor Author

Dnreikronos commented Mar 19, 2026

Thank you very much for your work!

No problem, mate. I'm here to help the community!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yeskunall yeskunall yeskunall approved these changes

@Anthony-Eid Anthony-Eid Awaiting requested review from Anthony-Eid

Assignees

@Anthony-Eid Anthony-Eid

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

UI deadlock in window_did_change_key_status during window activation (macOS, multi-window)

4 participants

@Dnreikronos @hackerbirds @Anthony-Eid @yeskunall