Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

Commit

Permalink
fix offline-startup edge-case (#1571)
Browse files Browse the repository at this point in the history
  • Loading branch information
luclu authored and frozeman committed Jan 18, 2017
1 parent eb9c3ef commit 36e89b3
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion modules/clientBinaryManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ class Manager extends EventEmitter {
.then((localConfig) => {
if (!localConfig) {
log.info('No config for the ClientBinaryManager could be loaded, using local clientBinaries.json.');
localConfig = require('../clientBinaries.json');

const localConfigPath = path.join(Settings.userDataPath, 'clientBinaries.json');
localConfig = (fs.existsSync(localConfigPath)) ? require(localConfigPath) : require('../clientBinaries.json'); // eslint-disable-line no-param-reassign, global-require, import/no-dynamic-require, import/no-unresolved
}

// scan for node
Expand Down

0 comments on commit 36e89b3

Please sign in to comment.