Minor UI fixes

ExpressLRS · Oct 28, 2023 · d8e29b4 · d8e29b4
1 parent 6753982
commit d8e29b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/js/index.js b/src/js/index.js
@@ -712,7 +712,7 @@ flashButton.onclick = async (e) => {
         text: 'Firmware upload complete'
       })
     } catch (e) {
-      errorHandler(e.message)
+      return errorHandler(e.message)
     } finally {
       closeDevice()
     }
@@ -818,7 +818,7 @@ function errorHandler (msg) {
   _('status').innerHTML = ''
   _('progressBar').value = 0
   mui.overlay('off')
-  SwalMUI.fire({
+  return SwalMUI.fire({
     icon: 'error',
     title: 'Update Failed',
     html: msg
@@ -829,7 +829,7 @@ function abortHandler (event) {
   _('status').innerHTML = ''
   _('progressBar').value = 0
   mui.overlay('off')
-  SwalMUI.fire({
+  return SwalMUI.fire({
     icon: 'info',
     title: 'Update Aborted',
     html: event.target.responseText

diff --git a/src/js/xmodem.js b/src/js/xmodem.js
@@ -269,12 +269,7 @@ class XmodemFlasher {
         while (!gotBootloader) {
           currAttempt++
           if (currAttempt > 10) {
-            await SwalMUI.fire({
-              icon: 'error',
-              title: 'Flashing Failed',
-              text: 'Failed to enter bootloader mode in a reasonable time'
-            })
-            throw new Error('[FAILED] to get to BL in reasonable time')
+            throw new Error('Failed to enter bootloader mode in a reasonable time')
           }
           this.log(`[${currAttempt}] retry...`)