rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Cleanup IDE quit()

Browse Source 
There were two different routines andling more or less the same operations.
Let the IDE call "real" quit when the last Editor windows is being closed.
This commit is contained in:
Martino Facchin 2018-11-08 18:07:29 +01:00
parent b7728beb52
commit e1a5be7354
1 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/processing/app/Base.java
View File

@ -925,45 +925,20 @@ public class Base {
*/ */
public boolean handleClose(Editor editor) { public boolean handleClose(Editor editor) {
// Check if modified // Check if modified
// boolean immediate = editors.size() == 1;
if (!editor.checkModified()) { if (!editor.checkModified()) {
return false; return false;
} }
if (editors.size() == 1) { if (editors.size() == 1) {
storeScreenDimensions();
storeSketches();
// This will store the sketch count as zero handleQuit();
editors.remove(editor);
try {
Editor.serialMonitor.close();
} catch (Exception e) {
//ignore
}
rebuildRecentSketchesMenuItems();
// Save out the current prefs state
PreferencesData.save();
// Since this wasn't an actual Quit event, call System.exit()
System.exit(0);
} else { } else {
// More than one editor window open, // More than one editor window open,
// proceed with closing the current window. // proceed with closing the current window.
editor.setVisible(false); editor.setVisible(false);
editor.dispose(); editor.dispose();
// for (int i = 0; i < editorCount; i++) {
// if (editor == editors[i]) {
// for (int j = i; j < editorCount-1; j++) {
// editors[j] = editors[j+1];
// }
// editorCount--;
// // Set to null so that garbage collection occurs
// editors[editorCount] = null;
// }
// }
editors.remove(editor); editors.remove(editor);
} }
return true; return true;