diff --git a/src/main/MainRunner.js b/src/main/MainRunner.js index cd1e759..1ef8317 100644 --- a/src/main/MainRunner.js +++ b/src/main/MainRunner.js @@ -15,6 +15,7 @@ export default class MainRunner { }) mainWindow.setMenu(null) + mainWindow.on('close', (event) => { event.preventDefault() MainRunner.exitApp(mainWindow) @@ -41,34 +42,37 @@ export default class MainRunner { return mainWindow } - static createCrashWindow (crashWindow, mainWindow, details) { + static createErrorWindow (errorWindow, mainWindow, details) { if (!Constants.IS_DEV_ENV) { mainWindow?.hide() } - crashWindow = new BrowserWindow({ + errorWindow = new BrowserWindow({ show: false, title: Constants.APP_NAME, icon: path.join(__static, Constants.APP_ICON), resizable: Constants.IS_DEV_ENV, webPreferences: Constants.DEFAULT_WEB_PREFERENCES }) - crashWindow.setMenu(null) - crashWindow.loadURL(`${Constants.APP_INDEX_URL}#/crash`).then(() => true) - crashWindow.on('ready-to-show', () => { + + errorWindow.setMenu(null) + errorWindow.loadURL(`${Constants.APP_INDEX_URL}#/error`).then(() => true) + + errorWindow.on('ready-to-show', () => { if (!Constants.IS_DEV_ENV && mainWindow && !mainWindow.isDestroyed()) { mainWindow.destroy() } - crashWindow.show() - crashWindow.focus() + errorWindow.show() + errorWindow.focus() }) - crashWindow.webContents.on('did-frame-finish-load', () => { + + errorWindow.webContents.on('did-frame-finish-load', () => { if (Constants.IS_DEV_ENV) { - crashWindow.webContents.openDevTools() + errorWindow.webContents.openDevTools() } }) - return crashWindow + return errorWindow } static exitApp (mainWindow) { diff --git a/src/main/index.js b/src/main/index.js index 806727b..fe32046 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -6,7 +6,7 @@ import Constants from './utils/Constants' import * as electronRemote from '@electron/remote/main' let mainWindow -let crashWindow +let errorWindow if (!Constants.IS_DEV_ENV) { global.__static = path.join(path.dirname(fileURLToPath(import.meta.url)), '/static') @@ -27,6 +27,7 @@ app.on('activate', () => { app.on('window-all-closed', () => { mainWindow = null + errorWindow = null if (!Constants.IS_MAC) { app.quit() @@ -34,5 +35,5 @@ app.on('window-all-closed', () => { }) app.on('render-process-gone', (ev, webContents, details) => { - crashWindow = MainRunner.createCrashWindow(crashWindow, mainWindow, details) + errorWindow = MainRunner.createErrorWindow(errorWindow, mainWindow, details) }) diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js index 6abe0e8..37e33c1 100644 --- a/src/renderer/router/index.js +++ b/src/renderer/router/index.js @@ -9,7 +9,7 @@ const router = createRouter({ component: MainScreen }, { - path: '/crash', + path: '/error', component: ErrorScreen }, {