YuuMJ1997/mihomo-party
1
0
Fork 0
mirror of https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party synced 2026-02-10 11:40:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve merge conflict and stabilize core/control flows

Browse Source
This commit is contained in:
xmk23333 2026-01-19 00:37:15 +08:00
parent 0cc1d238c9
commit 56e328191f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -7,5 +7,6 @@
}, },
"[json]": { "[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
} },
"terminal.integrated.defaultProfile.windows": "PowerShell"
} }

2
src/main/config/override.ts
View File

@ -48,8 +48,8 @@ export async function addOverrideItem(item: Partial<IOverrideItem>): Promise<voi
await updateOverrideItem(newItem) await updateOverrideItem(newItem)
} else { } else {
config.items.push(newItem) config.items.push(newItem)
await setOverrideConfig(config)
} }
await setOverrideConfig(config)
} }
export async function removeOverrideItem(id: string): Promise<void> { export async function removeOverrideItem(id: string): Promise<void> {

3
src/main/resolve/floatingWindow.ts
View File

@ -76,6 +76,7 @@ async function createFloatingWindow(): Promise<void> {
}) })
// IPC 监听器 // IPC 监听器
ipcMain.removeAllListeners('updateFloatingWindow')
ipcMain.on('updateFloatingWindow', () => { ipcMain.on('updateFloatingWindow', () => {
if (floatingWindow) { if (floatingWindow) {
floatingWindow.webContents.send('controledMihomoConfigUpdated') floatingWindow.webContents.send('controledMihomoConfigUpdated')
@ -130,8 +131,8 @@ export async function triggerFloatingWindow(): Promise<void> {
export async function closeFloatingWindow(): Promise<void> { export async function closeFloatingWindow(): Promise<void> {
if (floatingWindow) { if (floatingWindow) {
ipcMain.removeAllListeners('updateFloatingWindow')
floatingWindow.close() floatingWindow.close()
floatingWindow.destroy()
floatingWindow = null floatingWindow = null
} }
await showTrayIcon() await showTrayIcon()