jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-25 12:16:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2373 from resin-io/fix-drive-blacklist

Browse Source 
fix(gui): Fix error with empty drive blacklist
This commit is contained in:
Jonas Hermsmeier 2018-05-30 13:37:45 +02:00 committed by GitHub
commit 441069f04b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/gui/app/app.js
View File

@ -58,14 +58,6 @@ const updateLock = require('./modules/update-lock')
process.env.DRIVELIST_DEBUG = /drivelist|^\*$/i.test(process.env.DEBUG) ? '1' : '' process.env.DRIVELIST_DEBUG = /drivelist|^\*$/i.test(process.env.DEBUG) ? '1' : ''
window.localStorage.debug = process.env.DEBUG window.localStorage.debug = process.env.DEBUG
/**
* @summary Environment variable blacklisted drives by path
* @type {Array<String>}
* @constant
* @private
*/
const BLACKLISTED_DRIVES = settings.get('driveBlacklist')
const app = angular.module('Etcher', [ const app = angular.module('Etcher', [
require('angular-ui-router'), require('angular-ui-router'),
require('angular-ui-bootstrap'), require('angular-ui-bootstrap'),
@ -216,6 +208,10 @@ app.run(() => {
app.run(($timeout) => { app.run(($timeout) => {
driveScanner.on('devices', (drives) => { driveScanner.on('devices', (drives) => {
const BLACKLISTED_DRIVES = settings.has('driveBlacklist')
? settings.get('driveBlacklist').split(',')
: []
// Safely trigger a digest cycle. // Safely trigger a digest cycle.
// In some cases, AngularJS doesn't acknowledge that the // In some cases, AngularJS doesn't acknowledge that the
// available drives list has changed, and incorrectly // available drives list has changed, and incorrectly