fix: check for pane focus before removing it. #17164
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
approved these changes
Mar 1, 2019
|
Release Notes Persisted
|
|
I have automatically backported this PR to "5-0-x", please check out #17215 |
kiku-jw
pushed a commit
to kiku-jw/electron
that referenced
this pull request
May 16, 2019
Fixes electron#16883. This bug seems to have been introduced in the electron#15302's menu a11y refactor and is new in 5-0-x.
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.
Fixes #16883. This bug seems to have been introduced as a side-effect of #15302's menu a11y refactor and is new in 5-0-x.
Description of Change
The a11y refactor introduced code that tries to remove pane focus in
atom::MenuBar::OnBeforeExecuteCommand()whether it has focus or not, and callingAccessiblePaneView::RemovePaneFocus()when it doesn't have focus results in a nullptr dereference.This PR adds a test to check for pane focus before removing it.
CC @brenca
Checklist
npm testpassesRelease Notes
Notes: Fixed 5.0.0-beta.1 menuitem crash on Windows and Linux