Allow the autoupdater to quit the app normally.

Forcing it to quit would prematurely terminate the update on some
platforms.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

app/main/autoupdater.ts

@@ -1,7 +1,6 @@
 import {shell} from "electron/common";
 import {app, dialog, session} from "electron/main";
 import process from "node:process";
-import util from "node:util";
 
 import log from "electron-log";
 import type {UpdateDownloadedEvent, UpdateInfo} from "electron-updater";
@@ -11,7 +10,11 @@ import * as ConfigUtil from "../common/config-util";
 
 import {linuxUpdateNotification} from "./linuxupdater"; // Required only in case of linux
 
-const sleep = util.promisify(setTimeout);
+let quitting = false;
+
+export function shouldQuitForUpdate(): boolean {
+  return quitting;
+}
 
 export async function appUpdater(updateFromMenu = false): Promise<void> {
   // Don't initiate auto-updates in development
@@ -104,10 +107,8 @@ Current Version: ${app.getVersion()}`,
       detail: "It will be installed the next time you restart the application",
     });
     if (response === 0) {
-      await sleep(1000);
+      quitting = true;
       autoUpdater.quitAndInstall();
-      // Force app to quit. This is just a workaround, ideally autoUpdater.quitAndInstall() should relaunch the app.
-      app.quit();
     }
   });
   // Init for updates

app/main/index.ts

@@ -10,7 +10,7 @@ import * as ConfigUtil from "../common/config-util";
 import type {RendererMessage} from "../common/typed-ipc";
 import type {MenuProps} from "../common/types";
 
-import {appUpdater} from "./autoupdater";
+import {appUpdater, shouldQuitForUpdate} from "./autoupdater";
 import * as BadgeSettings from "./badge-settings";
 import handleExternalLink from "./handle-external-link";
 import * as AppMenu from "./menu";
@@ -91,7 +91,7 @@ function createMainWindow(): BrowserWindow {
       app.quit();
     }
 
-    if (!isQuitting) {
+    if (!isQuitting && !shouldQuitForUpdate()) {
       event.preventDefault();
 
       if (process.platform === "darwin") {