From 06445dd151bf1d8bcfd30f60812c0d65f940cfb1 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Fri, 11 Oct 2013 09:36:04 +0200
Subject: [PATCH] Preventing upload and serial monitor on not (yet) available
 boards

---
 app/src/processing/app/Editor.java | 6 ++++++
 app/src/processing/app/Sketch.java | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 29cf16fda..22c18a9f7 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -2512,6 +2512,12 @@ public class Editor extends JFrame implements RunnerListener {
     }
 
     BoardPort port = Base.getDiscoveryManager().find(Preferences.get("serial.port"));
+
+    if (port == null) {
+      statusError(I18n.format("Board at {0} is not available", Preferences.get("serial.port")));
+      return;
+    }
+
     serialMonitor = new UploaderAndMonitorFactory().newMonitor(port, base);
     serialMonitor.setIconImage(getIconImage());
 
diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java
index f18e4691d..370a0f137 100644
--- a/app/src/processing/app/Sketch.java
+++ b/app/src/processing/app/Sketch.java
@@ -1670,6 +1670,11 @@ public class Sketch {
 
     BoardPort boardPort = Base.getDiscoveryManager().find(Preferences.get("serial.port"));
 
+    if (boardPort == null) {
+      editor.statusError(I18n.format("Board at {0} is not available", Preferences.get("serial.port")));
+      return false;
+    }
+
     Uploader uploader = new UploaderAndMonitorFactory().newUploader(target.getBoards().get(board), boardPort);
 
     boolean success = false;