Merge pull request #137 from arduino/bugfix/stuck-in-loading

Stuck in loading files
arduino · Nov 5, 2024 · 169a01a · 169a01a
2 parents f99cba5 + 8192bbf
commit 169a01a
Showing 1 changed file with 24 additions and 12 deletions.
diff --git a/ui/arduino/store.js b/ui/arduino/store.js
@@ -406,24 +406,36 @@ async function store(state, emitter) {
     emitter.emit('render')
 
     if (state.isConnected) {
-      state.boardFiles = await getBoardFiles(
-        serial.getFullPath(
-          state.boardNavigationRoot,
-          state.boardNavigationPath,
-          ''
+      try {
+        state.boardFiles = await getBoardFiles(
+          serial.getFullPath(
+            state.boardNavigationRoot,
+            state.boardNavigationPath,
+            ''
+          )
         )
-      )
+      } catch (e) {
+        state.boardFiles = []
+      }
     } else {
       state.boardFiles = []
     }
 
-    state.diskFiles = await getDiskFiles(
-      disk.getFullPath(
-        state.diskNavigationRoot,
-        state.diskNavigationPath,
-        ''
+    try {
+      state.diskFiles = await getDiskFiles(
+        disk.getFullPath(
+          state.diskNavigationRoot,
+          state.diskNavigationPath,
+          ''
+        )
       )
-    )
+    } catch (e) {
+      state.diskNavigationRoot = null
+      state.diskNavigationPath = '/'
+      state.isLoadingFiles = false
+      emitter.emit('render')
+      return
+    }
 
     emitter.emit('refresh-selected-files')
     state.isLoadingFiles = false