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.

Sign up for GitHub

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

Jump to bottom

fix: make tray not block main process #18969

Merged
merged 1 commit into from Jun 28, 2019
Merged

fix: make tray not block main process #18969

merged 1 commit into from Jun 28, 2019

Conversation

codebytere
Copy link
Member

Backport of #18880.

See that PR for more details.

Notes: Fixed an issue where the Tray icon context menu on macOS blocked the main process while open.

@trop trop bot mentioned this pull request Jun 25, 2019
Merged
4 tasks
ckerr
ckerr requested changes Jun 25, 2019
View reviewed changes
Copy link
Member

@ckerr ckerr left a comment

Choose a reason for hiding this comment

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

Looks like an unresolved conflict crept into this.

Also, do we want to resolve Deepak's questions in #18880 before sending this back to 6.0?

atom/browser/ui/tray_icon_cocoa.mm Outdated Show resolved Hide resolved
@codebytere codebytere force-pushed the bp-tray-block-6 branch 2 times, most recently from f24efde to 5f93dd4 Compare June 26, 2019 00:44
@codebytere
Copy link
Member Author

codebytere commented Jun 26, 2019 •
edited

@ckerr this now includes update from #18977.

@codebytere codebytere requested a review from ckerr June 26, 2019 00:44
@codebytere
fix: make tray not block main process (#18880)
6b8c49b 
* fix: make tray not block main process

* make AtomMenuModel refcounted
@ckerr ckerr merged commit a4acc16 into 6-0-x Jun 28, 2019
@release-clerk
Copy link

release-clerk bot commented Jun 28, 2019

Release Notes Persisted

Fixed an issue where the Tray icon context menu on macOS blocked the main process while open.

@ckerr ckerr deleted the bp-tray-block-6 branch June 28, 2019 19:10
This was referenced Jun 28, 2019
Merged
Merged
@trop
Copy link
Contributor

trop bot commented Jun 28, 2019

I have automatically backported this PR to "4-2-x", please check out #19035

@trop
Copy link
Contributor

trop bot commented Jun 28, 2019

I have automatically backported this PR to "5-0-x", please check out #19036

@sofianguy sofianguy added this to Fixed in 5.0.7 in 5.0.x Jul 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ckerr ckerr ckerr approved these changes

@zcbenz zcbenz zcbenz approved these changes

@MarshallOfSound MarshallOfSound MarshallOfSound approved these changes

@miniak miniak Awaiting requested review from miniak

Assignees
No one assigned
Labels
6-0-x backport This is a backport PR
Projects
No open projects
5.0.x
Fixed in 5.0.7
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@codebytere @ckerr @zcbenz @MarshallOfSound