diff --git a/electron/api/frpc.ts b/electron/api/frpc.ts index bb89deb..e620f49 100644 --- a/electron/api/frpc.ts +++ b/electron/api/frpc.ts @@ -258,13 +258,16 @@ export const stopFrpcProcess = (callback?: () => void) => { treeKill(frpcProcess.pid, (error: Error) => { if (error) { log.error(`关闭frpc子进程失败 pid:${frpcProcess.pid} error:${error}`) + callback() } else { log.info(`关闭frpc子进程成功`) frpcProcess = null clearInterval(frpcStatusListener) + callback() } - callback() }) + } else { + callback() } } diff --git a/electron/main/index.ts b/electron/main/index.ts index 02b445d..16422b7 100644 --- a/electron/main/index.ts +++ b/electron/main/index.ts @@ -192,7 +192,7 @@ app.on("activate", () => { }); app.on('before-quit', () => { - log.info("退出") + log.info("before-quit") isQuiting = true; })