yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
2 changed files with 5 additions and 3 deletions
Showing only changes of commit f84c4d95b3 - Show all commits

View File

@ -101,8 +101,6 @@ function createTray() {
quit() quit()
} else { } else {
await mainWindow.webContents.send('quitAndInstall'); await mainWindow.webContents.send('quitAndInstall');
mainWindow.show()
mainWindow.focus()
} }
}, },
// icon: iconPath, // icon: iconPath,

View File

@ -104,7 +104,11 @@ const App: React.FC = () => {
storage.setItem('setting', JSON.stringify(setting)) storage.setItem('setting', JSON.stringify(setting))
}) })
window.electron.quitAndInstall(async (_e: any) => { window.electron.quitAndInstall(async (_e: any) => {
let bool = await window.electron.isVisible()
if (bool) {
storage.setItem('quitMeeting', true) storage.setItem('quitMeeting', true)
window.electron.setViewStatus('show')
}
}) })
window.electron.isOpenWindows(async (_e: any) => { window.electron.isOpenWindows(async (_e: any) => {
let bool = await window.electron.isVisible() let bool = await window.electron.isVisible()