修复 MacOS 下点击 dock 右键菜单的退出按钮时,程序没有退出的问题(#1923)

This commit is contained in:
lyswhut
2024-06-03 18:29:54 +08:00
parent b7bb21f091
commit 69ba619f24
5 changed files with 15 additions and 19 deletions
+5 -3
View File
@@ -5,7 +5,7 @@ import { URL_SCHEME_RXP } from '@common/constants'
import { getTheme, initHotKey, initSetting, parseEnvParams } from './utils'
import { navigationUrlWhiteList } from '@common/config'
import defaultSetting from '@common/defaultSetting'
import { closeWindow, isExistWindow as isExistMainWindow, showWindow as showMainWindow } from './modules/winMain'
import { isExistWindow as isExistMainWindow, showWindow as showMainWindow } from './modules/winMain'
import { createAppEvent, createDislikeEvent, createListEvent } from '@main/event'
import { isMac, log } from '@common/utils'
import createWorkers from './worker'
@@ -158,6 +158,9 @@ export const listenerAppEvent = (startApp: () => void) => {
}
})
app.on('before-quit', () => {
global.lx.isSkipTrayQuit = true
})
app.on('window-all-closed', () => {
if (isMac) return
@@ -209,7 +212,6 @@ export const initAppSetting = async() => {
if (!global.lx) {
const config = await initHotKey()
global.lx = {
isTrafficLightClose: false,
isSkipTrayQuit: false,
// mainWindowClosed: true,
event_app: createAppEvent(),
@@ -275,5 +277,5 @@ export const initAppSetting = async() => {
export const quitApp = () => {
global.lx.isSkipTrayQuit = true
closeWindow()
app.quit()
}