.vscode/settings.json

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

src/main/config/override.ts

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

src/main/core/manager.ts

@@ -134,7 +134,7 @@ interface CoreConfig {
 }
 
 // 准备核心配置
-async function prepareCore(detached: boolean, skipStop = false): Promise<CoreConfig> {
+async function prepareCore(detached: boolean): Promise<CoreConfig> {
   const [appConfig, mihomoConfig] = await Promise.all([
     getAppConfig(),
     getControledMihomoConfig()
@@ -144,7 +144,8 @@ async function prepareCore(detached: boolean, skipStop = false): Promise<CoreCon
     core = 'mihomo',
     autoSetDNS = true,
     diffWorkDir = false,
-    mihomoCpuPriority = 'PRIORITY_NORMAL'
+    mihomoCpuPriority = 'PRIORITY_NORMAL',
+    testProfileOnStart = true
   } = appConfig
 
   const { 'log-level': logLevel = 'info' as LogLevel, tun } = mihomoConfig
@@ -167,10 +168,10 @@ async function prepareCore(detached: boolean, skipStop = false): Promise<CoreCon
 
   // generateProfile 返回实际使用的 current
   const current = await generateProfile()
-  await checkProfile(current, core, diffWorkDir)
-  if (!skipStop) {
-    await stopCore()
+  if (testProfileOnStart) {
+    await checkProfile(current, core, diffWorkDir)
   }
+  await stopCore()
   await cleanupSocketFile()
 
   // 设置 DNS
@@ -322,8 +323,8 @@ function setupCoreListeners(
 }
 
 // 启动核心
-export async function startCore(detached = false, skipStop = false): Promise<Promise<void>[]> {
-  const config = await prepareCore(detached, skipStop)
+export async function startCore(detached = false): Promise<Promise<void>[]> {
+  const config = await prepareCore(detached)
   child = spawnCoreProcess(config)
 
   if (detached) {
@@ -376,34 +377,11 @@ export async function restartCore(): Promise<void> {
   }
 
   isRestarting = true
-  let retryCount = 0
-  const maxRetries = 3
-
   try {
-    // 先显式停止核心，确保状态干净
-    await stopCore()
-
-    // 尝试启动核心，失败时重试
-    while (retryCount < maxRetries) {
-      try {
-        // skipStop=true 因为我们已经在上面停止了核心
-        await startCore(false, true)
-        return // 成功启动，退出函数
-      } catch (e) {
-        retryCount++
-        managerLogger.error(`restart core failed (attempt ${retryCount}/${maxRetries})`, e)
-
-        if (retryCount >= maxRetries) {
-          throw e
-        }
-
-        // 重试前等待一段时间
-        await new Promise((resolve) => setTimeout(resolve, 1000 * retryCount))
-        // 确保清理干净再重试
-        await stopCore()
-        await cleanupSocketFile()
-      }
-    }
+    await startCore()
+  } catch (e) {
+    managerLogger.error('restart core failed', e)
+    throw e
   } finally {
     isRestarting = false
   }

src/main/resolve/floatingWindow.ts

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