jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-27 21:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(usb): Ignore errors if winusb doesn't load (#1970)

Browse Source 
Due to some Windows systems missing certain C runtime libraries
(Visual C/C++ 2012 / 2015 Redistributables), we ignore errors when loading
this module until we can ensure distribution of those along with it.

Change-Type: patch
Changelog-Entry: Fix "The specified module could not be found" on Windows
Fixes #1956
This commit is contained in:
Jonas Hermsmeier 2018-01-18 09:11:46 -08:00 committed by GitHub
parent 8d863638cc
commit 45c72f0c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/shared/sdk/usbboot/usb.js
View File

@ -74,6 +74,10 @@ exports.listDevices = () => {
// Include driverless devices into the list of USB devices. // Include driverless devices into the list of USB devices.
if (process.platform === 'win32') { if (process.platform === 'win32') {
// NOTE: Temporarily ignore errors when loading winusb-driver-generator,
// due to C Runtime issues on Windows;
// see https://github.com/resin-io/etcher/issues/1956
try {
const winusbDriverGenerator = require('winusb-driver-generator') const winusbDriverGenerator = require('winusb-driver-generator')
for (const device of winusbDriverGenerator.listDriverlessDevices()) { for (const device of winusbDriverGenerator.listDriverlessDevices()) {
devices.push({ devices.push({
@ -84,6 +88,9 @@ exports.listDevices = () => {
} }
}) })
} }
} catch (error) {
// Ignore error
}
} }
return Bluebird.resolve(devices) return Bluebird.resolve(devices)