mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5320 from deepak1556/desktopcapture_api_patch

Browse source 
renderer: fix desktop capture api not responding different subsequest calls
This commit is contained in:
Cheng Zhao 2016-04-28 20:14:58 +09:00
commit 850bc2d443
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/api/atom_api_desktop_capturer.cc
View file

@ -89,7 +89,6 @@ void DesktopCapturer::OnSourceThumbnailChanged(int index) {
bool DesktopCapturer::OnRefreshFinished() { bool DesktopCapturer::OnRefreshFinished() {
Emit("finished", media_list_->GetSources()); Emit("finished", media_list_->GetSources());
media_list_.reset();
return false; return false;
} }

12
spec/api-desktop-capturer-spec.js
View file

@ -24,4 +24,16 @@ describe('desktopCapturer', function () {
desktopCapturer.getSources({types: ['window', 'screen']}, callback) desktopCapturer.getSources({types: ['window', 'screen']}, callback)
desktopCapturer.getSources({types: ['window', 'screen']}, callback) desktopCapturer.getSources({types: ['window', 'screen']}, callback)
}) })
it('responds to subsequest calls of different options', function (done) {
var callCount = 0
var callback = function (error, sources) {
callCount++
assert.equal(error, null)
if (callCount === 2) done()
}
desktopCapturer.getSources({types: ['window']}, callback)
desktopCapturer.getSources({types: ['screen']}, callback)
})
}) })