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

renderer: fix desktop capture api not responding different subsequest calls #5320

Merged
merged 1 commit into from
Apr 28, 2016

Conversation

deepak1556
Copy link
Member

Race condition between media_list reset on DesktopCapturer::StartHandling and DesktopCapturer::OnRefreshFinished

Fixes #5269

@zcbenz
Copy link
Contributor

zcbenz commented Apr 28, 2016

I'm not sure if it is the root cause, but the test doesn't pass in CI:

not ok 79 desktopCapturer responds to subsequest calls of different options
  AssertionError: 0 != 0
      at callback (/home/travis/build/electron/electron/spec/api-desktop-capturer-spec.js:32:14)
      at EventEmitter.<anonymous> (/home/travis/build/electron/electron/out/D/resources/electron.asar/renderer/api/desktop-capturer.js:33:12)
      at EventEmitter.g (events.js:273:16)
      at emitTwo (events.js:100:13)
      at EventEmitter.emit (events.js:185:7)

@deepak1556 deepak1556 force-pushed the desktopcapture_api_patch branch from cbb7668 to 9f9bafc Compare April 28, 2016 08:13
@deepak1556 deepak1556 force-pushed the desktopcapture_api_patch branch from 9f9bafc to d64e378 Compare April 28, 2016 08:55
@deepak1556
Copy link
Member Author

have fixed the failing test, the screen capture sources was returning empty on the CI.

@zcbenz
Copy link
Contributor

zcbenz commented Apr 28, 2016

👍

@zcbenz zcbenz merged commit 850bc2d into electron:master Apr 28, 2016
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.

2 participants