fix: app update fails when opening quick ask (janhq#2467)

DEVBOX10 · Mar 22, 2024 · 36405fe · 36405fe
1 parent 419683d
commit 36405fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/electron/handlers/update.ts b/electron/handlers/update.ts
@@ -23,7 +23,7 @@ export function handleAppUpdates() {
       message: 'Would you like to download and install it now?',
       buttons: ['Download', 'Later'],
     })
-    trayManager.destroyCurrentTray()
+
     if (action.response === 0) await autoUpdater.downloadUpdate()
   })
 
@@ -38,6 +38,7 @@ export function handleAppUpdates() {
       buttons: ['Restart', 'Later'],
     })
     if (action.response === 0) {
+      trayManager.destroyCurrentTray()
       waitingToInstallVersion = _info?.version
       autoUpdater.quitAndInstall()
     }

diff --git a/electron/main.ts b/electron/main.ts
@@ -11,7 +11,7 @@ import { getAppConfigurations, log } from '@janhq/core/node'
  * IPC Handlers
  **/
 import { injectHandler } from './handlers/common'
-import { handleAppUpdates } from './handlers/update'
+import { handleAppUpdates, waitingToInstallVersion } from './handlers/update'
 import { handleAppIPCs } from './handlers/native'
 
 /**
@@ -96,7 +96,7 @@ app.once('quit', () => {
 
 app.once('window-all-closed', () => {
   // Feature Toggle for Quick Ask
-  if (getAppConfigurations().quick_ask) return
+  if (getAppConfigurations().quick_ask && !waitingToInstallVersion) return
   cleanUpAndQuit()
 })