From e0df7e9d20c6328a3d14be6c736efa9b64f3fc9e Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 13 May 2022 14:18:50 -0400 Subject: [PATCH] Change update default to update on quit (#5390) --- src/main/app-updater.ts | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/main/app-updater.ts b/src/main/app-updater.ts index 0b7a5609b8..363575e4d3 100644 --- a/src/main/app-updater.ts +++ b/src/main/app-updater.ts @@ -28,10 +28,9 @@ function handleAutoUpdateBackChannel(event: Electron.IpcMainEvent, ...[arg]: Upd autoUpdater.quitAndInstall(true, true); } else { logger.info(`${AutoUpdateLogPrefix}: User chose to update on quit`); - autoUpdater.autoInstallOnAppQuit = true; } } else { - logger.info(`${AutoUpdateLogPrefix}: User chose not to update`); + logger.info(`${AutoUpdateLogPrefix}: User chose not to update, will update on quit anyway`); } } @@ -44,9 +43,9 @@ autoUpdater.logger = { /** * starts the automatic update checking - * @param interval milliseconds between interval to check on, defaults to 24h + * @param interval milliseconds between interval to check on, defaults to 2h */ -export const startUpdateChecking = once(function (interval = 1000 * 60 * 60 * 24): void { +export const startUpdateChecking = once(function (interval = 1000 * 60 * 60 * 2): void { if (!isAutoUpdateEnabled() || isTestEnv) { return; } @@ -54,26 +53,17 @@ export const startUpdateChecking = once(function (interval = 1000 * 60 * 60 * 24 const userStore = UserStore.getInstance(); autoUpdater.autoDownload = false; - autoUpdater.autoInstallOnAppQuit = false; + autoUpdater.autoInstallOnAppQuit = true; autoUpdater.channel = userStore.updateChannel; autoUpdater.allowDowngrade = userStore.isAllowedToDowngrade; autoUpdater .on("update-available", (info: UpdateInfo) => { - if (autoUpdater.autoInstallOnAppQuit) { - // a previous auto-update loop was completed with YES+LATER, check if same version - if (installVersion === info.version) { - // same version, don't broadcast - return; - } + if (installVersion === info.version) { + // same version, don't broadcast + return; } - /** - * This should be always set to false here because it is the reasonable - * default. Namely, if a don't auto update to a version that the user - * didn't ask for. - */ - autoUpdater.autoInstallOnAppQuit = false; installVersion = info.version; autoUpdater.downloadUpdate()