fix: potential crash on macOS app exit #29941
Merged
Conversation
This file contains 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
codebytere
commented
Jun 29, 2021
| @@ -415,7 +415,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) { | |||
| // Use an NSEvent monitor to listen for the wheel event. | |||
| BOOL __block began = NO; | |||
| wheel_event_monitor_ = [NSEvent | |||
| addLocalMonitorForEventsMatchingMask:NSScrollWheelMask | |||
There was a problem hiding this comment.
this is deprecated in favor of NSEventMaskScrollWheel
jkleinsc
approved these changes
Jun 29, 2021
miniak
approved these changes
Jun 29, 2021
MarshallOfSound
approved these changes
Jun 29, 2021
zcbenz
approved these changes
Jun 30, 2021
|
Release Notes Persisted
|
|
I was unable to backport this PR to "12-x-y" cleanly; |
This was referenced Jun 30, 2021
|
I have automatically backported this PR to "13-x-y", please check out #29961 |
|
I have automatically backported this PR to "14-x-y", please check out #29962 |
zcbenz
pushed a commit
that referenced
this pull request
Jul 15, 2021
BlackHole1
pushed a commit
to BlackHole1/electron
that referenced
this pull request
Aug 30, 2021
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.
Description of Change
Closes #29260.
Fixes an issue where Electron could crash after calling
app.quit()on macOS. This can happen as a result of[NSEvent removeMonitor:](https://developer.apple.com/documentation/appkit/nsevent/1533709-removemonitor?language=objc) being called twice; from the documentation discussion:This fixes any potential issues by ensuring that we only call
[NSEvent removeMonitor:]on a non-nilid. Chromium uses a similar approach here.Checklist
npm testpassesRelease Notes
Notes: Fixes a potential crash when calling
app.quit()on macOS.