Merge branch 'beta' into beta_dupe_serial_fix

Author: makermelissa

js/workflows/usb.js

@@ -22,6 +22,8 @@ class USBWorkflow extends Workflow {
         this._uid = null;
         this._readLoopPromise = null;
         this._messageCallback = null;
+        this._btnSelectHostFolderCallback = null;
+        this._btnUseHostFolderCallback = null;
     }
 
     async init(params) {
@@ -164,11 +166,18 @@ class USBWorkflow extends Workflow {
         btnRequestSerialDevice.removeEventListener('click', serialConnect);
         btnRequestSerialDevice.addEventListener('click', serialConnect);
 
-        btnSelectHostFolder.removeEventListener('click', this._selectHostFolder);
-        btnSelectHostFolder.addEventListener('click', this._selectHostFolder);
+        btnSelectHostFolder.removeEventListener('click', this._btnSelectHostFolderCallback)
+        this._btnSelectHostFolderCallback = async (event) => {
+            await this._selectHostFolder();
+        };
+        btnSelectHostFolder.addEventListener('click', this._btnSelectHostFolderCallback);
+
 
-        btnUseHostFolder.removeEventListener('click', this._useHostFolder);
-        btnUseHostFolder.addEventListener('click', this._useHostFolder);
+        btnUseHostFolder.removeEventListener('click', this._btnUseHostFolderCallback);
+        this._btnUseHostFolderCallback = async (event) => {
+            await this._useHostFolder();
+        }
+        btnUseHostFolder.addEventListener('click', this._btnUseHostFolderCallback);
 
         // Check if WebSerial is available
         if (!(await this.available() instanceof Error)) {