Skip to content

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

Merged
Anthony-Eid merged 1 commit into
zed-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 into
zed-industries:mainfrom
Dnreikronos:fix/popup-window-deadlock

Conversation

@Dnreikronos

@Dnreikronos Dnreikronos commented Mar 8, 2026

Copy link
Copy Markdown
Contributor

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.

@hackerbirds

Copy link
Copy Markdown

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

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

Thanks for fixing this!

@hackerbirds

Copy link
Copy Markdown

Thank you very much for your work!

@Dnreikronos

Copy link
Copy Markdown
Contributor Author

Thank you very much for your work!

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

piper-of-dawn pushed a commit to piper-of-dawn/zed that referenced this pull request Apr 25, 2026
…dustries#51035)

Closes zed-industries#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
- [x] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-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.
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
…dustries#51035)

Closes zed-industries#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
- [x] Done a self-review taking into account security and performance
aspects
- [ ] Aligned any UI changes with the [UI
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

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