From c1cff1e3c232629f09a53d8df43698a307a06b29 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 18 Jan 2023 17:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DmacOS=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E9=80=80=E5=87=BA=E5=8A=9F=E8=83=BD=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E5=AE=8C=E5=85=A8=E9=80=80=E5=87=BA=E8=BD=AF=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=88#1148=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md        | 1 +
 src/main/modules/appMenu.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 878e2b2b..09ebe121 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -4,3 +4,4 @@
 - 修复声音输出设备更改时后的自动暂停播放设置无效的问题
 - 重写桌面歌词窗口坐标的计算逻辑，修复桌面歌词移动到最边缘时，某些情况下在启用歌词后会出现窗口偏移的问题（远古bug了）
 - 修复随机播放模式下使用稍后播放功能播放我的列表的歌曲时，切换下一曲永远是当前歌曲的问题（#1147）
+- 修复macOS下的软件系统菜单中的退出功能不会完全退出软件的问题（#1148）
diff --git a/src/main/modules/appMenu.ts b/src/main/modules/appMenu.ts
index 870d231a..4b34ed90 100644
--- a/src/main/modules/appMenu.ts
+++ b/src/main/modules/appMenu.ts
@@ -1,6 +1,5 @@
 import { app, Menu } from 'electron'
 import { isMac } from '@common/utils'
-import { quitApp } from '@main/app'
 
 
 export default () => {
@@ -17,7 +16,8 @@ export default () => {
             label: '退出',
             accelerator: 'Command+Q',
             click() {
-              quitApp()
+              global.lx.isSkipTrayQuit = true
+              app.quit()
             },
           },
         ],