Merge 5776b61af4 into d51d45b38c

electron/main/update.ts

@@ -2,9 +2,12 @@ import { app, ipcMain } from 'electron'
 import {
   type ProgressInfo,
   type UpdateDownloadedEvent,
+  CancellationToken,
   autoUpdater
 } from 'electron-updater'
 
+let cancellationToken = new CancellationToken()
+
 export function update(win: Electron.BrowserWindow) {
 
   // When set to false, the update download will be triggered through the API
@@ -56,6 +59,12 @@ export function update(win: Electron.BrowserWindow) {
     )
   })
 
+  // Cancel downloading
+  ipcMain.handle('cancel-download', () => {
+    cancellationToken.cancel()
+    cancellationToken = new CancellationToken();
+  })
+
   // Install now
   ipcMain.handle('quit-and-install', () => {
     autoUpdater.quitAndInstall(false, true)
@@ -69,5 +78,5 @@ function startDownload(
   autoUpdater.on('download-progress', info => callback(null, info))
   autoUpdater.on('error', error => callback(error, null))
   autoUpdater.on('update-downloaded', complete)
-  autoUpdater.downloadUpdate()
+  autoUpdater.downloadUpdate(cancellationToken)
 }

src/components/update/index.tsx

@@ -18,7 +18,7 @@ const Update = () => {
     onCancel?: () => void
     onOk?: () => void
   }>({
-    onCancel: () => setModalOpen(false),
+    onCancel: () => ipcRenderer.invoke('cancel-download').then(() => setModalOpen(false)),
     onOk: () => ipcRenderer.invoke('start-download'),
   })