github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-17 11:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 客户端打开出现报错

Browse Source
This commit is contained in:
kuaifan 2022-12-08 10:08:04 +08:00
parent 68ec8fb905
commit ea4bf4f87a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
electron/electron.js vendored
View File

@ -15,6 +15,7 @@ const config = require('./package.json');
let mainWindow = null, let mainWindow = null,
mainTray = null, mainTray = null,
subWindow = [], subWindow = [],
isReady = false,
willQuitApp = false, willQuitApp = false,
devloadUrl = "", devloadUrl = "",
devloadCachePath = path.resolve(__dirname, ".devload"); devloadCachePath = path.resolve(__dirname, ".devload");
@ -171,6 +172,7 @@ if (!getTheLock) {
utils.setShowWindow(mainWindow) utils.setShowWindow(mainWindow)
}) })
app.on('ready', () => { app.on('ready', () => {
isReady = true
// 创建主窗口 // 创建主窗口
createMainWindow() createMainWindow()
// 创建托盘 // 创建托盘
@ -209,9 +211,13 @@ if (!getTheLock) {
app.on('activate', () => { app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) { if (BrowserWindow.getAllWindows().length === 0) {
createMainWindow() if (isReady) {
} else if (!mainWindow.isVisible()) { createMainWindow()
mainWindow.show() }
} else if (mainWindow) {
if (!mainWindow.isVisible()) {
mainWindow.show()
}
} }
}) })