From b76899a353fdaf2fd9b68425ad019ed40366e53e Mon Sep 17 00:00:00 2001
From: Emily <ehou@mozilla.com>
Date: Thu, 12 Jul 2018 11:22:49 -0700
Subject: [PATCH] fix download cancel

---
 app/fileReceiver.js | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/fileReceiver.js b/app/fileReceiver.js
index ceffccf6..dc5ab526 100644
--- a/app/fileReceiver.js
+++ b/app/fileReceiver.js
@@ -94,7 +94,6 @@ export default class FileReceiver extends Nanobus {
     this.downloadRequest = {
       cancel: () => {
         this.sendMessageToSw({ request: 'cancel', id: this.fileInfo.id });
-        throw new Error(0);
       }
     };
 
@@ -129,17 +128,17 @@ export default class FileReceiver extends Nanobus {
         document.body.appendChild(a);
         a.click();
         URL.revokeObjectURL(downloadUrl);
+      }
 
-        let prog = 0;
-        while (prog < this.fileInfo.size) {
-          const msg = await this.sendMessageToSw({
-            request: 'progress',
-            id: this.fileInfo.id
-          });
-          prog = msg.progress;
-          onprogress([prog, this.fileInfo.size]);
-          await delay();
-        }
+      let prog = 0;
+      while (prog < this.fileInfo.size) {
+        const msg = await this.sendMessageToSw({
+          request: 'progress',
+          id: this.fileInfo.id
+        });
+        prog = msg.progress;
+        onprogress([prog, this.fileInfo.size]);
+        await delay();
       }
 
       this.downloadRequest = null;
@@ -147,6 +146,9 @@ export default class FileReceiver extends Nanobus {
       this.state = 'complete';
     } catch (e) {
       this.downloadRequest = null;
+      if (e === 'cancelled') {
+        throw new Error(0);
+      }
       throw e;
     }
   }