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

fix: crash when failed to get devices in desktopCapturer (#17557)

Browse source 
* fix: crash when failed to get devices in desktopCapturer

* return after emit
This commit is contained in:
Shelley Vohr 2019-04-25 15:12:38 -07:00 committed by GitHub
parent 2ad942323c
commit c2c3a04628
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,8 +165,12 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
std::vector<std::string> device_names; std::vector<std::string> device_names;
// Crucially, this list of device names will be in the same order as // Crucially, this list of device names will be in the same order as
// |media_list_sources|. // |media_list_sources|.
webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames( if (!webrtc::DxgiDuplicatorController::Instance()->GetDeviceNames(
&device_names); &device_names)) {
Emit("error", "Failed to get sources.");
return;
}
int device_name_index = 0; int device_name_index = 0;
for (auto& source : screen_sources) { for (auto& source : screen_sources) {
const auto& device_name = device_names[device_name_index++]; const auto& device_name = device_names[device_name_index++];

9
lib/browser/desktop-capturer.js
View file

@ -26,7 +26,8 @@ ipcMainUtils.handle('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', (event, cap
thumbnailSize, thumbnailSize,
fetchWindowIcons fetchWindowIcons
}, },
resolve resolve,
reject
} }
requestsQueue.push(request) requestsQueue.push(request)
if (requestsQueue.length === 1) { if (requestsQueue.length === 1) {
@ -46,6 +47,12 @@ desktopCapturer.emit = (event, name, sources, fetchWindowIcons) => {
const handledRequest = requestsQueue.shift() const handledRequest = requestsQueue.shift()
const unhandledRequestsQueue = [] const unhandledRequestsQueue = []
if (name === 'error') {
const error = sources
handledRequest.reject(error)
return
}
const result = sources.map(source => { const result = sources.map(source => {
return { return {
id: source.id, id: source.id,