Skip to content

Commit 83e7c5a

Browse files
authored
Merge pull request #176 from arduino/fix/loading-files-overlay
Fix/loading files overlay
2 parents b9283e5 + 4852de6 commit 83e7c5a

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

ui/arduino/store.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ async function confirmDialog(msg, cancelMsg, confirmMsg) {
1414
// cancelMsg = cancelMsg || 'Cancel'
1515
// confirmMsg = confirmMsg || 'Yes'
1616
let buttons = []
17-
if (cancelMsg) buttons.push(cancelMsg)
1817
if (confirmMsg) buttons.push(confirmMsg)
18+
if (cancelMsg) buttons.push(cancelMsg)
19+
1920
let response = await win.openDialog({
2021
type: 'question',
21-
buttons: [cancelMsg, confirmMsg],
22-
cancelId: 0,
22+
buttons: buttons,
23+
defaultId: 0,
24+
cancelId: 1,
2325
message: msg
2426
})
2527
console.log('confirm', response)
@@ -1172,6 +1174,9 @@ async function store(state, emitter) {
11721174
log('open-selected-files')
11731175
let filesToOpen = []
11741176
let filesAlreadyOpen = []
1177+
if (state.isLoadingFiles) return
1178+
state.isLoadingFiles = true
1179+
emitter.emit('render')
11751180
for (let i in state.selectedFiles) {
11761181
let selectedFile = state.selectedFiles[i]
11771182
if (selectedFile.type == 'folder') {
@@ -1251,6 +1256,7 @@ async function store(state, emitter) {
12511256
state.selectedFiles = []
12521257
state.view = 'editor'
12531258
updateMenu()
1259+
state.isLoadingFiles = false
12541260
emitter.emit('render')
12551261
})
12561262
emitter.on('open-file', (source, file) => {

0 commit comments

Comments
 (0)