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: destroy tray on current tick #19619

Merged
merged 1 commit into from Aug 5, 2019

Conversation

@codebytere
Copy link
Member

commented Aug 4, 2019

Backport of #18196.

See that PR for more details.

Notes: Fixed an issue where tray.destroy was not working properly on some linux distros.

fix: destroy tray on current tick (#18196)
This code was originally added in #6448 to handle an edge case crash in 10.9, and we no longer support 10.9 and therefore no longer need to account for this case.

It addressed the crash, but also created a race condition whereby when a new tray is created the old tray's destroy wouldn't have been fully completed and therefore a new one would be spawned. This fixes that by destroying the tray on the current tick once more.

@trop trop bot referenced this pull request Aug 4, 2019

Merged

fix: destroy tray on current tick #18196

4 of 4 tasks complete
@zcbenz

zcbenz approved these changes Aug 5, 2019

@zcbenz zcbenz merged commit fc94fb4 into 5-0-x Aug 5, 2019

12 of 14 checks passed

build-linux Workflow: build-linux
Details
electron-arm-testing Build #20190804.5 had test failures
Details
Artifact Comparison No Changes
Details
Semantic Pull Request ready to be squashed
Details
Valid Backport Valid Backport
Details
WIP Ready for review
Details
appveyor: win-ia32-testing AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
build-mac Workflow: build-mac
Details
electron-arm64-testing Build #20190804.5 succeeded
Details
lint Workflow: lint
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Copy link

commented Aug 5, 2019

Release Notes Persisted

Fixed an issue where tray.destroy was not working properly on some linux distros.

@zcbenz zcbenz deleted the tray-tick-5 branch Aug 5, 2019

@codebytere

This comment has been minimized.

Copy link
Member Author

commented Aug 5, 2019

/trop run backport-to 4-2-x

@trop

This comment has been minimized.

Copy link
Contributor

commented Aug 5, 2019

The backport process for this PR has been manually initiated,
sending your 1's and 0's to "4-2-x" here we go! :D

@trop

This comment has been minimized.

Copy link
Contributor

commented Aug 5, 2019

I was unable to backport this PR to "4-2-x" cleanly;
you will need to perform this backport manually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.