Merge pull request #2779 from MartinFournier/fix/electron-mac-crash

Fix 'Steam not running' popup causing crash on MacOS
This commit is contained in:
hydroflame 2022-01-26 00:36:57 -05:00 committed by GitHub
commit de122eca73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -100,8 +100,8 @@ function setStopProcessHandler(app, window, enabled) {
}
}
function startWindow(noScript) {
gameWindow.createWindow(noScript);
async function startWindow(noScript) {
return gameWindow.createWindow(noScript);
}
global.app_handlers = {
@ -119,15 +119,14 @@ app.whenReady().then(async () => {
setStopProcessHandler(app, window, true);
await utils.exportSave(window);
} else {
startWindow(process.argv.includes("--no-scripts"));
}
if (global.greenworksError) {
dialog.showMessageBox({
title: 'Bitburner',
message: 'Could not connect to Steam',
detail: `${global.greenworksError}\n\nYou won't be able to receive achievements until this is resolved and you restart the game.`,
type: 'warning', buttons: ['OK']
});
const window = await startWindow(process.argv.includes("--no-scripts"));
if (global.greenworksError) {
await dialog.showMessageBox(window, {
title: "Bitburner",
message: "Could not connect to Steam",
detail: `${global.greenworksError}\n\nYou won't be able to receive achievements until this is resolved and you restart the game.`,
type: 'warning', buttons: ['OK']
});
}
}
});