From 948dd117d3f355571d5226d916b63a7ce0b25017 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Tue, 2 Jan 2024 15:43:55 +0530
Subject: [PATCH] refactor: file download controller

---
 .../web/src/javascripts/Controllers/FilesController.ts    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/web/src/javascripts/Controllers/FilesController.ts b/packages/web/src/javascripts/Controllers/FilesController.ts
index f47e6be6a..d1d8c51db 100644
--- a/packages/web/src/javascripts/Controllers/FilesController.ts
+++ b/packages/web/src/javascripts/Controllers/FilesController.ts
@@ -391,6 +391,10 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
         })
       }
     } catch (error) {
+      if (error instanceof DOMException && error.name === 'AbortError') {
+        return
+      }
+
       console.error(error)
 
       addToast({
@@ -658,7 +662,9 @@ export class FilesController extends AbstractViewController<FilesControllerEvent
   }
 
   downloadFiles = async (files: FileItem[]) => {
-    if (this.platform === Platform.MacDesktop) {
+    // macOS doesn't allow multiple calls to the filepicker at the
+    // same time, so we need to iterate one by one
+    if (this.platform === Platform.MacDesktop || this.platform === Platform.MacWeb) {
       for (const file of files) {
         await this.handleFileAction({
           type: FileItemActionType.DownloadFile,