arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

Merge branch 'master' into new-extension

Browse Source 
Conflicts:
	app/src/processing/app/Editor.java
This commit is contained in:
David A. Mellis
2010-12-25 18:59:59 -06:00
parent 3625a1001e 300f5e2ed0
commit 12d4552c66
20 changed files with 1133 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2292,7 +2292,6 @@ public class Editor extends JFrame implements RunnerListener {
public boolean serialPrompt() {
populateSerialMenu();
int count = serialMenu.getItemCount();
Object[] names = new Object[count];
for (int i = 0; i < count; i++) {
@ -2357,7 +2356,9 @@ public class Editor extends JFrame implements RunnerListener {
// error message will already be visible
}
} catch (SerialNotFoundException e) {
if (serialPrompt()) run();
populateSerialMenu();
if (serialMenu.getItemCount() == 0) statusError(e);
else if (serialPrompt()) run();
else statusNotice("Upload canceled.");
} catch (RunnerException e) {
//statusError("Error during upload.");
@ -2389,7 +2390,9 @@ public class Editor extends JFrame implements RunnerListener {
// error message will already be visible
}
} catch (SerialNotFoundException e) {
if (serialPrompt()) run();
populateSerialMenu();
if (serialMenu.getItemCount() == 0) statusError(e);
else if (serialPrompt()) run();
else statusNotice("Upload canceled.");
} catch (RunnerException e) {
//statusError("Error during upload.");