fix: fix restart after update (#458)

Author: kantord

main/src/main.ts

@@ -93,7 +93,14 @@ export async function blockQuit(source: string, event?: Electron.Event) {
     event.preventDefault()
   }
 
-  mainWindow?.webContents.send('graceful-exit')
+  // Only send graceful-exit message if mainWindow is still valid
+  try {
+    if (mainWindow && !mainWindow.isDestroyed()) {
+      mainWindow.webContents.send('graceful-exit')
+    }
+  } catch (err) {
+    log.error('Failed to send graceful-exit message: ', err)
+  }
 
   try {
     const port = getToolhivePort()
@@ -394,6 +401,36 @@ ipcMain.handle('restart-toolhive', async () => {
   }
 })
 
+ipcMain.handle('install-update-and-restart', () => {
+  log.info('Installing update and restarting application')
+  // Set a flag to indicate we're installing an update
+  // This will prevent the graceful shutdown process
+  isQuitting = true
+  tearingDown = true
+
+  // Stop ToolHive and servers immediately without graceful shutdown
+  try {
+    const port = getToolhivePort()
+    if (port) {
+      stopAllServers(binPath, port).catch((err) => {
+        log.error('Failed to stop servers during update: ', err)
+      })
+    }
+  } catch (err) {
+    log.error('Failed to get port during update: ', err)
+  }
+
+  // Stop ToolHive
+  stopToolhive()
+
+  // Destroy tray
+  tray?.destroy()
+
+  // Install update and restart
+  autoUpdater.quitAndInstall()
+  return { success: true }
+})
+
 // Shutdown store IPC handlers
 ipcMain.handle('shutdown-store:get-last-servers', () => {
   return getLastShutdownServers()

preload/src/preload.ts

@@ -27,6 +27,10 @@ contextBridge.exposeInMainWorld('electronAPI', {
   // ToolHive restart
   restartToolhive: () => ipcRenderer.invoke('restart-toolhive'),
 
+  // Update installation
+  installUpdateAndRestart: () =>
+    ipcRenderer.invoke('install-update-and-restart'),
+
   // Theme management
   darkMode: {
     toggle: () => ipcRenderer.invoke('dark-mode:toggle'),
@@ -100,6 +104,7 @@ export interface ElectronAPI {
     success: boolean
     error?: string
   }>
+  installUpdateAndRestart: () => Promise<{ success: boolean }>
   darkMode: {
     toggle: () => Promise<boolean>
     system: () => Promise<boolean>

renderer/src/common/components/layout/top-nav/index.tsx

@@ -121,7 +121,7 @@ export function TopNav(props: HTMLProps<HTMLElement>) {
           onClick: async () => {
             const confirmed = await confirmQuit()
             if (confirmed) {
-              window.electronAPI.quitApp()
+              window.electronAPI.installUpdateAndRestart()
             }
           },
         },