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: tray setContextMenu crash #13513

Merged
merged 1 commit into from
Jun 29, 2018
Merged

fix: tray setContextMenu crash #13513

merged 1 commit into from
Jun 29, 2018

Conversation

maxine
Copy link

@maxine maxine commented Jun 29, 2018

Fixes #12803 and related to #11818.

This PR addresses an issue whereby on close the Tray context menu attempted to run a Callback which had not been set and was therefore null. Instead, we now wrap the call in a null check and post a task asynchronously to mirror parallel behavior on regular context menu close.

cc @codebytere @sethlu @gnahzak

Checklist
  • PR description included and stakeholders cc'd
  • npm test passes
  • commit messages or PR title follow semantic commit guidelines

Co-authored-by: Zhuo Lu <sethlu@mintkit.net>
Co-authored-by: Kristine Zhang <kzhang@slack-corp.com>
@maxine maxine requested a review from a team June 29, 2018 19:28
Copy link
Member

@codebytere codebytere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm 🚀

@codebytere codebytere merged commit 6cf68f8 into master Jun 29, 2018
@codebytere codebytere deleted the tray-context-menu-fix branch June 29, 2018 21:49
@trop
Copy link
Contributor

trop bot commented Jun 29, 2018

We have automatically backported this PR to "2-0-x", please check out #13516

@trop
Copy link
Contributor

trop bot commented Jun 29, 2018

We have automatically backported this PR to "3-0-x", please check out #13517

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.

Electron 2.0 crash related to menu
3 participants