Merge branch 'master' into canary

This commit is contained in:
CHaBou 2017-09-21 00:09:04 +02:00
commit e8a9741194
No known key found for this signature in database
GPG key ID: EF8D073B729A0B33

View file

@ -13,14 +13,14 @@ const {platform} = process;
let isInit = false; let isInit = false;
function init() { async function init() {
autoUpdater.on('error', (err, msg) => { autoUpdater.on('error', (err, msg) => {
//eslint-disable-next-line no-console //eslint-disable-next-line no-console
console.error('Error fetching updates', msg + ' (' + err.stack + ')'); console.error('Error fetching updates', msg + ' (' + err.stack + ')');
}); });
const config = retry(() => { const config = await retry(async () => {
const content = getConfig(); const content = await getConfig();
if (!content) { if (!content) {
throw new Error('No config content loaded'); throw new Error('No config content loaded');