fix: replace app.isQuitting with module-level let isQuitting
This commit is contained in:
1 parent
13aead949b
commit
80e9363ba5
1 file changed
+4
-3
+4
-3
@@ -11,6 +11,7 @@ const ROOT = IS_PACKAGED
|
|||||||
|
|
||||||
const PROJECT_DIR = path.join(ROOT, 'project')
|
const PROJECT_DIR = path.join(ROOT, 'project')
|
||||||
const LOG_DIR = path.join(PROJECT_DIR, 'logs')
|
const LOG_DIR = path.join(PROJECT_DIR, 'logs')
|
||||||
|
let isQuitting = false
|
||||||
|
|
||||||
/* ===== Icon ===== */
|
/* ===== Icon ===== */
|
||||||
const ICON_B64 = 'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAL0lEQVR4nO3OIQEAAAgDMHJg6Ul1iHEzMb/q2UsqAQEBAQEBAQEBAQEBAQGBdOABvyXoW2Q1L3wAAAAASUVORK5CYII='
|
const ICON_B64 = 'iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAL0lEQVR4nO3OIQEAAAgDMHJg6Ul1iHEzMb/q2UsqAQEBAQEBAQEBAQEBAQGBdOABvyXoW2Q1L3wAAAAASUVORK5CYII='
|
||||||
@@ -76,7 +77,7 @@ function createLogWindow(): void {
|
|||||||
})
|
})
|
||||||
logWindow.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(LOG_HTML)}`)
|
logWindow.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(LOG_HTML)}`)
|
||||||
logWindow.on('close', (e) => {
|
logWindow.on('close', (e) => {
|
||||||
if (!app.isQuitting) { e.preventDefault(); logWindow?.hide() }
|
if (!isQuitting) { e.preventDefault(); logWindow?.hide() }
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,7 +118,7 @@ function createTray(): void {
|
|||||||
{ label: '打开页面', click: () => { try { require('child_process').exec('start http://localhost:3000') } catch {} } },
|
{ label: '打开页面', click: () => { try { require('child_process').exec('start http://localhost:3000') } catch {} } },
|
||||||
{ label: '显示/隐藏 日志', click: toggleWindow },
|
{ label: '显示/隐藏 日志', click: toggleWindow },
|
||||||
{ type: 'separator' },
|
{ type: 'separator' },
|
||||||
{ label: '退出', click: () => { app.isQuitting = true; stopBackend(); app.quit() } },
|
{ label: '退出', click: () => { isQuitting = true; stopBackend(); app.quit() } },
|
||||||
]))
|
]))
|
||||||
tray.on('double-click', toggleWindow)
|
tray.on('double-click', toggleWindow)
|
||||||
}
|
}
|
||||||
@@ -138,6 +139,6 @@ app.whenReady().then(() => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
app.on('window-all-closed', () => { /* keep running in tray */ })
|
app.on('window-all-closed', () => { /* keep running in tray */ })
|
||||||
app.on('before-quit', () => { app.isQuitting = true; stopBackend() })
|
app.on('before-quit', () => { isQuitting = true; stopBackend() })
|
||||||
|
|
||||||
ipcMain.handle('get-log-buffer', () => logBuffer)
|
ipcMain.handle('get-log-buffer', () => logBuffer)
|
||||||
Reference in new issue
Block a user