From 2359a1444b4e1f9de7fd189699815b1d9537264f Mon Sep 17 00:00:00 2001 From: lyswhut Date: Tue, 14 Dec 2021 23:00:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=B0=8F=E5=8C=96?= =?UTF-8?q?=E6=89=98=E7=9B=98=E8=AE=BE=E7=BD=AE=E4=B8=8D=E8=B5=B7=E4=BD=9C?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/modules/winLyric/index.js | 2 +- src/main/rendererEvents/winEvent.js | 2 +- src/renderer/event/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/modules/winLyric/index.js b/src/main/modules/winLyric/index.js index 9b0471dd..f4d6293a 100644 --- a/src/main/modules/winLyric/index.js +++ b/src/main/modules/winLyric/index.js @@ -27,7 +27,7 @@ const setLyricsConfig = debounce(config => { const winEvent = lyricWindow => { // let bounds // lyricWindow.on('close', event => { - // if (global.isQuitting || !global.appSetting.tray.isToTray || (!isWin && !global.isTrafficLightClose)) { + // if (global.isQuitting || !global.appSetting.tray.isShow || (!isWin && !global.isTrafficLightClose)) { // lyricWindow.setProgressBar(-1) // return // } diff --git a/src/main/rendererEvents/winEvent.js b/src/main/rendererEvents/winEvent.js index 6d797ec9..89fad810 100644 --- a/src/main/rendererEvents/winEvent.js +++ b/src/main/rendererEvents/winEvent.js @@ -5,7 +5,7 @@ global.isTrafficLightClose = false // 是否点击软件上的关闭按钮关闭 module.exports = mainWindow => { mainWindow.on('close', event => { - if (global.isQuitting || !global.appSetting.tray.isToTray || (!isWin && !global.isTrafficLightClose)) { + if (global.isQuitting || !global.appSetting.tray.isShow || (!isWin && !global.isTrafficLightClose)) { mainWindow.setProgressBar(-1) global.lx_event.winLyric.close() return diff --git a/src/renderer/event/index.js b/src/renderer/event/index.js index 865737e8..83ded121 100644 --- a/src/renderer/event/index.js +++ b/src/renderer/event/index.js @@ -29,7 +29,7 @@ eventHub.on(baseName.bindKey, () => { // 软件内快捷键的最小化触发时 // 如果已启用托盘，则隐藏程序，否则最小化程序 https://github.com/lyswhut/lx-music-desktop/issues/603 - if (appHotKeyConfig.local.keys[key].action == hotKeyNamesCommon.min.action && global.appSetting.tray.isToTray) { + if (appHotKeyConfig.local.keys[key].action == hotKeyNamesCommon.min.action && global.appSetting.tray.isShow) { eventHub.emit(hotKeyNamesCommon.hide_toggle.action) return }