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: close context menu before popup #17474

Merged
merged 1 commit into from Mar 22, 2019
Merged

fix: close context menu before popup #17474

merged 1 commit into from Mar 22, 2019

Conversation

zcbenz
Copy link
Member

@zcbenz zcbenz commented Mar 20, 2019

Description of Change

Close #17353.

Fix crash when showing a tray menu while one is already shown.

Checklist

Release Notes

Notes: Fix crash when showing a tray menu while one is already shown.

@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Mar 20, 2019
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.

🎉

@@ -24,6 +24,23 @@ describe('tray module', () => {
})
})

describe('tray.popUpContextMenu', () => {
before(function () {
Copy link
Member

Choose a reason for hiding this comment

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

i think this might only be needed on windows? it's failing on macOS as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

It seems that this API is blocking on macOS. I have changed the test to only run on Windows.

@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Mar 21, 2019
@MarshallOfSound
Copy link
Member

Unclear if related, if not I'll raise a tracking issue, looks like we have crash-on-exit on osx

0   Electron Framework                  0x0000000112387d19 base::debug::CollectStackTrace(void**, unsigned long) + 9
1   Electron Framework                  0x0000000112250a93 base::debug::StackTrace::StackTrace() + 19
2   Electron Framework                  0x0000000112387bb1 base::debug::(anonymous namespace)::StackDumpSignalHandler(int, __siginfo*, void*) + 2385
3   libsystem_platform.dylib            0x00007fffe7776b3a _sigtramp + 26
4   ???                                 0x00007fff541dd390 0x0 + 140734604628880
5   Electron Framework                  0x0000000112166728 base::ObserverList<atom::api::ExtendedWebContentsObserver, false, true, base::internal::CheckedObserverAdapter>::RemoveObserver(atom::api::ExtendedWebContentsObserver const*) + 120
6   Electron Framework                  0x0000000112164574 atom::api::BrowserWindow::~BrowserWindow() + 148
7   Electron Framework                  0x000000011216477e atom::api::BrowserWindow::~BrowserWindow() + 14
8   Electron Framework                  0x000000011216bf67 base::internal::Invoker<base::internal::BindState<void (mate::TrackableObjectBase::*)(), base::WeakPtr<mate::TrackableObjectBase> >, void ()>::RunOnce(base::internal::BindStateBase*) + 183
9   Electron Framework                  0x00000001122ed363 base::TaskAnnotator::RunTask(char const*, base::PendingTask*) + 323
10  Electron Framework                  0x0000000112309d7f base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoWorkImpl(base::sequence_manager::LazyNow*, bool*) + 719
11  Electron Framework                  0x000000011230a39e base::sequence_manager::internal::ThreadControllerWithMessagePumpImpl::DoDelayedWork(base::TimeTicks*) + 158
12  Electron Framework                  0x00000001123bd735 base::MessagePumpCFRunLoopBase::RunWork() + 85
13  Electron Framework                  0x0000000112245d9a base::mac::CallWithEHFrame(void () block_pointer) + 10
14  Electron Framework                  0x00000001123bceff base::MessagePumpCFRunLoopBase::RunWorkSource(void*) + 63

https://circleci.com/gh/electron/electron/161051

@zcbenz
Copy link
Member Author

zcbenz commented Mar 22, 2019

@MarshallOfSound It is a known crash: #16580. This PR only affects Windows code.

@codebytere codebytere merged commit 49f13e3 into master Mar 22, 2019
@release-clerk
Copy link

release-clerk bot commented Mar 22, 2019

Release Notes Persisted

Fix crash when showing a tray menu while one is already shown.

@trop
Copy link
Contributor

trop bot commented Mar 22, 2019

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

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.

None yet

3 participants