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: Ensure DirectX capturer is supported #13993

Merged
merged 3 commits into from
Aug 9, 2018
Merged

fix: Ensure DirectX capturer is supported #13993

merged 3 commits into from
Aug 9, 2018

Conversation

ckerr
Copy link
Member

@ckerr ckerr commented Aug 9, 2018

Manual backport of #13543

I don't even know yet if this builds on Windows and usually wouldn't do a premature PR like this; however since time is a factor for 2.1.0 and I'm about to EOD, this is here if someone wants to take the baton and run with it.

@ajmacd @MarshallOfSound

Ensure DirectX capturer is supported.
@ckerr ckerr requested a review from a team August 9, 2018 02:51
@ckerr
Copy link
Member Author

ckerr commented Aug 9, 2018

Both CI failures are

not ok 47 app module mixed sandbox option when app.enableMixedSandbox() is called adds --enable-sandbox to render processes created with sandbox: true
  Error: Timeout of 30000ms exceeded. For async tests and hooks, ensure "done()" is called; if returning a Promise, ensure it resolves.
      at C:\projects\electron\spec\node_modules\mocha\lib\runnable.js:232:19
not ok 48 app module mixed sandbox option when the app is launched with --enable-mixed-sandbox adds --enable-sandbox to render processes created with sandbox: true
  Error: Timeout of 30000ms exceeded. For async tests and hooks, ensure "done()" is called; if returning a Promise, ensure it resolves.

which is the mixed-sandbox issue discussed at #13769 and #13770 and I think can be disregarded here

@ckerr ckerr merged commit 9694cdc into 2-1-x Aug 9, 2018
@ckerr ckerr deleted the ajm-win7-crash_2-1-x branch August 9, 2018 04:31
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

2 participants