From 643f8479e31e1349479b3770a96f09cba52d76ae Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Fri, 8 Apr 2016 17:57:56 +0200
Subject: [PATCH] Restore serial.port.iserial field

uses 2893c2d64314f3fa298fffb5c90d8e27c8614d08
---
 .../src/cc/arduino/packages/uploaders/SerialUploader.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
index f5f308a07..d59325a5c 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -177,6 +177,13 @@ public class SerialUploader extends Uploader {
       Thread.sleep(100);
     }
 
+    BoardPort boardPort = BaseNoGui.getDiscoveryManager().find(PreferencesData.get("serial.port"));
+    try {
+      prefs.put("serial.port.iserial", boardPort.getPrefs().getOrExcept("iserial"));
+    } catch (Exception e) {
+      // if serial port does not contain an iserial field
+    }
+
     prefs.put("build.path", buildPath);
     prefs.put("build.project_name", className);
     if (verbose) {