Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: emit 'shutdown' outside -[NSApplication terminate:] #24111

Merged
merged 1 commit into from Jun 16, 2020

Conversation

codebytere
Copy link
Member

@codebytere codebytere commented Jun 12, 2020

Description of Change

Closes #24105.

When macOS shuts down, Cocoa will send an NSWorkspaceWillPowerOffNotification followed by -[NSApplication terminate:]. The original PR that added this on macOS hooked into the latter instead of the former, thereby creating the side effect that it would also be called when the app itself terminated.

For more effective dx, this PR registers for NSWorkspaceWillPowerOffNotification and then emits 'shutdown' when the notification is sent instead.

cc @zcbenz @deepak1556 @nornagon

Checklist

Release Notes

Notes: Fixed an issue where shutdown would be emitted both on app and system shutdown on macOS.

@codebytere codebytere requested a review from zcbenz June 12, 2020 20:16
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Jun 12, 2020
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Jun 13, 2020
@codebytere codebytere merged commit 9c7d73c into master Jun 16, 2020
@release-clerk
Copy link

release-clerk bot commented Jun 16, 2020

Release Notes Persisted

Fixed an issue where shutdown would be emitted both on app and system shutdown on macOS.

@trop
Copy link
Contributor

trop bot commented Jun 16, 2020

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

@trop trop bot removed the target/10-x-y label Jun 16, 2020
@trop
Copy link
Contributor

trop bot commented Jun 16, 2020

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

@trop
Copy link
Contributor

trop bot commented Jun 16, 2020

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

sentialx pushed a commit to sentialx/electron that referenced this pull request Jul 30, 2020
sentialx pushed a commit to sentialx/electron that referenced this pull request Apr 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

macOS: powerMonitor 'shutdown' event is emitted when quitting from the dock icon
3 participants