rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-12 09:29:23 +01:00
Code Issues Releases Activity

Disallow opening Serial monitor during compilation

Browse Source 
Commit 6d5597b070c7bedce15047c7c560249965cc0bfc introduced a guard against multiple concurrent operations.
This guard also avoid any real serial monitor "open" during the compile+upload phase, but it didn't handle keyboard shortcuts.

Fixes https://github.com/arduino/Arduino/issues/6015
This commit is contained in:
Martino Facchin 2017-02-24 16:42:58 +01:00
parent 58422f71a0
commit c0a99f9ec9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/app/Editor.java
View File

@ -2168,6 +2168,8 @@ public class Editor extends JFrame implements RunnerListener {
console.clear(); console.clear();
status.progress(tr("Uploading to I/O Board...")); status.progress(tr("Uploading to I/O Board..."));
avoidMultipleOperations = true;
new Thread(timeoutUploadHandler).start(); new Thread(timeoutUploadHandler).start();
new Thread(usingProgrammer ? exportAppHandler : exportHandler).start(); new Thread(usingProgrammer ? exportAppHandler : exportHandler).start();
} }

1
app/src/processing/app/EditorToolbar.java
View File

@ -376,7 +376,6 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
// launch a timeout timer which can reenable to upload button functionality an // launch a timeout timer which can reenable to upload button functionality an
if (!editor.avoidMultipleOperations) { if (!editor.avoidMultipleOperations) {
editor.handleExport(e.isShiftDown()); editor.handleExport(e.isShiftDown());
editor.avoidMultipleOperations = true;
} }
break; break;