fixed initialization on first run

This commit is contained in:
Alberto Miranda
2017-02-01 14:35:28 -03:00
parent 50c100130a
commit 086d8bf00a
2 changed files with 32 additions and 8 deletions

View File

@@ -1,4 +1,5 @@
const appConfig = require('application-config')('WebTorrent')
const fs = require('fs')
const path = require('path')
const electron = require('electron')
const arch = require('arch')
@@ -105,7 +106,7 @@ const exports = module.exports = {
}
const configFile = appConfig.filePath
const config = require(configFile)
const config = getConfig()
const watchers = []
function watch() {
@@ -162,13 +163,19 @@ exports.subscribe = function (fn) {
}
exports.getPlugins = function () {
return config.plugins
return config.plugins || {}
}
exports.getConfigPath = getConfigPath
exports.getConfig = getConfig
exports.getConfig = function () {
return config
function getConfig () {
const config = {}
try {
return require(configFile)
} catch (e) {
return config
}
}
function getConfigPath () {
@@ -214,8 +221,6 @@ function isPortable () {
return false
}
const fs = require('fs')
try {
// This line throws if the "Portable Settings" folder does not exist, and does
// nothing otherwise.