Skip to content

fix: handle missing NativeWindowMac in ElectronNSWindow#47751

Merged
codebytere merged 1 commit intomainfrom
cleanup-shell
Jul 17, 2025
Merged

fix: handle missing NativeWindowMac in ElectronNSWindow#47751
codebytere merged 1 commit intomainfrom
cleanup-shell

Conversation

@codebytere
Copy link
Member

@codebytere codebytere commented Jul 15, 2025

Description of Change

Closes #47679.
Refs #44628

Fixes an issue where certain operations performed in a window close callback could trigger a crash. After #44628 it's possible for ElectronNSWindow to outlive shell_ and thus we should check that it's not nullptr prior to use.

Checklist

Release Notes

Notes: Fixed an issue where certain operations performed in a window close callback could trigger a crash.

@codebytere codebytere added semver/patch backwards-compatible bug fixes target/36-x-y PR should also be added to the "36-x-y" branch. target/37-x-y PR should also be added to the "37-x-y" branch. target/38-x-y PR should also be added to the "38-x-y" branch. labels Jul 15, 2025
@electron-cation electron-cation bot added the new-pr 🌱 PR opened recently label Jul 15, 2025
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened recently label Jul 16, 2025
@codebytere codebytere merged commit 895bf91 into main Jul 17, 2025
57 checks passed
@codebytere codebytere deleted the cleanup-shell branch July 17, 2025 12:49
@release-clerk
Copy link

release-clerk bot commented Jul 17, 2025

Release Notes Persisted

Fixed an issue where certain operations performed in a window close callback could trigger a crash.

This was referenced Jul 17, 2025
Merged
Merged
@trop
Copy link
Contributor

trop bot commented Jul 17, 2025

I have automatically backported this PR to "36-x-y", please check out #47811

@trop trop bot added in-flight/36-x-y and removed target/36-x-y PR should also be added to the "36-x-y" branch. labels Jul 17, 2025
@trop trop bot mentioned this pull request Jul 17, 2025
Merged
@trop
Copy link
Contributor

trop bot commented Jul 17, 2025

I have automatically backported this PR to "38-x-y", please check out #47812

@trop
Copy link
Contributor

trop bot commented Jul 17, 2025

I have automatically backported this PR to "37-x-y", please check out #47813

@trop trop bot added in-flight/38-x-y in-flight/37-x-y merged/38-x-y PR was merged to the "38-x-y" branch. and removed target/38-x-y PR should also be added to the "38-x-y" branch. target/37-x-y PR should also be added to the "37-x-y" branch. in-flight/38-x-y in-flight/37-x-y labels Jul 17, 2025
@trop trop bot added merged/37-x-y PR was merged to the "37-x-y" branch. merged/36-x-y PR was merged to the "36-x-y" branch. and removed in-flight/36-x-y labels Jul 18, 2025
kigh-ota pushed a commit to kigh-ota/electron that referenced this pull request Sep 30, 2025
@codebytere @kigh-ota
fix: handle missing NativeWindowMac in ElectronNSWindow (electron…
a8c1c3f 
…#47751)

fix: handle missing NativeWindowMac in ElectronNSWindow
This was referenced Feb 22, 2026
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@VerteDinde VerteDinde VerteDinde approved these changes

@ckerr ckerr Awaiting requested review from ckerr

@deepak1556 deepak1556 Awaiting requested review from deepak1556

@samuelmaddock samuelmaddock Awaiting requested review from samuelmaddock

Assignees

No one assigned

Labels

merged/36-x-y PR was merged to the "36-x-y" branch. merged/37-x-y PR was merged to the "37-x-y" branch. merged/38-x-y PR was merged to the "38-x-y" branch. semver/patch backwards-compatible bug fixes

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Electron crashes on macOS in accessibilityFocusedUIElement

2 participants

@codebytere @VerteDinde