Skip to content

Commit f442628

Browse files
committed
Transfer operations lock shortcuts. Progress is reset.
Signed-off-by: ubi de feo <[email protected]>
1 parent 3c1fc6c commit f442628

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

ui/arduino/store.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ async function store(state, emitter) {
5959
state.isSaving = false
6060
state.savingProgress = 0
6161
state.isTransferring = false
62-
state.transferringProgress = 0
62+
state.transferringProgress = ''
6363
state.isRemoving = false
6464

6565
state.isLoadingFiles = false
@@ -1312,7 +1312,9 @@ async function store(state, emitter) {
13121312
state.transferringProgress = `${fileName}: ${progress}`
13131313
emitter.emit('render')
13141314
}
1315+
13151316
)
1317+
state.transferringProgress = ''
13161318
} else {
13171319
await serialBridge.uploadFile(
13181320
srcPath, destPath,
@@ -1321,6 +1323,7 @@ async function store(state, emitter) {
13211323
emitter.emit('render')
13221324
}
13231325
)
1326+
state.transferringProgress = ''
13241327
}
13251328
}
13261329

@@ -1448,6 +1451,7 @@ async function store(state, emitter) {
14481451
}),
14491452

14501453
win.onKeyboardShortcut((key) => {
1454+
if (state.isTransferring || state.isRemoving || state.isSaving || state.isConnectionDialogOpen || state.isNewFileDialogOpen) return
14511455
if (state.shortcutsDisabled) return
14521456
if (key === shortcuts.CLOSE) {
14531457
emitter.emit('close-tab', state.editingFile)

0 commit comments

Comments
 (0)