diff --git a/src/bootstrap.js b/src/bootstrap.js index 51de6cc..eeef06a 100644 --- a/src/bootstrap.js +++ b/src/bootstrap.js @@ -14,8 +14,8 @@ global.releaseChannel = buildInfo.releaseChannel; log('BuildInfo', buildInfo); -const { fatal, handled, init: EHInit } = require('./errorHandler'); -EHInit(); +const { fatal } = require('./errorHandler'); +// process.on('uncaughtException', fatal); const splash = require('./splash'); @@ -69,7 +69,7 @@ const startUpdate = async () => { inst.on('host-updated', () => autoStart.update(() => {})); inst.on('unhandled-exception', fatal); inst.on('InconsistentInstallerState', fatal); - inst.on('update-error', handled); + inst.on('update-error', console.error); require('./firstRun').do(inst); } else { diff --git a/src/errorHandler.js b/src/errorHandler.js index 23b59f6..a4f2977 100644 --- a/src/errorHandler.js +++ b/src/errorHandler.js @@ -1,25 +1,8 @@ const { app, dialog } = require("electron"); -exports.init = () => { - process.on('uncaughtException', err => { - const stack = err.stack ?? String(err); - console.warn(stack); - // dialog.showErrorBox('A JavaScript error occurred in the main process', message); - }); -}; - - -exports.fatal = (err) => { - log('ErrorHandler', 'Fatal:', err); - - dialog.showMessageBox(null, { - type: 'error', - message: 'A fatal Javascript error occured', - detail: err?.stack ?? String(err) - }).then(() => app.quit()); -}; - -exports.handled = (err) => { - log('ErrorHandler', 'Handled:', err); -}; \ No newline at end of file +exports.fatal = (e) => dialog.showMessageBox({ + type: 'error', + message: 'A fatal Javascript error occured', + detail: e?.stack ?? String(e) +}).then(() => app.quit()); \ No newline at end of file