diff --git a/desktop/src/main/start.ts b/desktop/src/main/start.ts index ccaa35aac8..731aa1022a 100644 --- a/desktop/src/main/start.ts +++ b/desktop/src/main/start.ts @@ -385,15 +385,20 @@ autoUpdater.on('update-available', (info: UpdateInfo) => { app.quit() } isUpdating = true + setDownloadProgress(0) }) }) autoUpdater.on('download-progress', (progressObj: ProgressInfo) => { + setDownloadProgress(progressObj.percent) +}) + +function setDownloadProgress (percent: number): void { if (mainWindow === undefined) return - mainWindow.setProgressBar(progressObj.percent / 100) - mainWindow.webContents.send('handle-update-download-progress', progressObj.percent) -}) + mainWindow.setProgressBar(percent / 100) + mainWindow.webContents.send('handle-update-download-progress', percent) +} autoUpdater.on('update-downloaded', (info) => { // We have listeners that prevents the app from being exited on mac diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts index 34e9900b9e..39ee4b1eee 100644 --- a/packages/presentation/src/utils.ts +++ b/packages/presentation/src/utils.ts @@ -687,7 +687,7 @@ export function setPresentationCookie (token: string, workspaceId: string): void setToken('/files/' + workspaceId) } -export const upgradeDownloadProgress = writable(0) +export const upgradeDownloadProgress = writable(-1) export function setDownloadProgress (percent: number): void { if (Number.isNaN(percent)) { diff --git a/plugins/guest-resources/src/components/GuestApp.svelte b/plugins/guest-resources/src/components/GuestApp.svelte index 46b9a6542f..f4b71de44a 100644 --- a/plugins/guest-resources/src/components/GuestApp.svelte +++ b/plugins/guest-resources/src/components/GuestApp.svelte @@ -32,7 +32,7 @@