From 54971e451f7bf57fb7be17943edccc5510d1632e Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Fri, 12 Jun 2015 10:57:33 +0200
Subject: [PATCH] SerialUploader: actualUploadPort may still be null, in that
 case fall back to userSelectedUploadPort

---
 .../src/cc/arduino/packages/uploaders/SerialUploader.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
index f95344995..1b5c8c9fe 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -192,6 +192,9 @@ public class SerialUploader extends Uploader {
     if (finalUploadPort == null) {
       finalUploadPort = actualUploadPort;
     }
+    if (finalUploadPort == null) {
+      finalUploadPort = userSelectedUploadPort;
+    }
     BaseNoGui.selectSerialPort(finalUploadPort);
     return uploadResult;
   }