From 101677bba23b6da6d55a46b89d95be0167d47d83 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bcmi-labs.cc>
Date: Tue, 25 Jul 2017 23:00:09 +0200
Subject: [PATCH] Fixed NPE introduced in 125846f5

Fix #6552
---
 arduino-core/src/processing/app/Serial.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arduino-core/src/processing/app/Serial.java b/arduino-core/src/processing/app/Serial.java
index 3726f0535..484ac1190 100644
--- a/arduino-core/src/processing/app/Serial.java
+++ b/arduino-core/src/processing/app/Serial.java
@@ -65,8 +65,8 @@ public class Serial implements SerialPortEventListener {
       PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
       PreferencesData.getInteger("serial.databits", 8),
       PreferencesData.getFloat("serial.stopbits", 1),
-      !BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"),
-      !BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true"));
+      !BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
+      !BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
   }
 
   public Serial(int irate) throws SerialException {
@@ -74,16 +74,16 @@ public class Serial implements SerialPortEventListener {
       PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
       PreferencesData.getInteger("serial.databits", 8),
       PreferencesData.getFloat("serial.stopbits", 1),
-      !BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"),
-      !BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true"));
+      !BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
+      !BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
   }
 
   public Serial(String iname, int irate) throws SerialException {
     this(iname, irate, PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
       PreferencesData.getInteger("serial.databits", 8),
       PreferencesData.getFloat("serial.stopbits", 1),
-      !BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"),
-      !BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true"));
+      !BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
+      !BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
   }
 
   public Serial(String iname) throws SerialException {
@@ -91,8 +91,8 @@ public class Serial implements SerialPortEventListener {
       PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
       PreferencesData.getInteger("serial.databits", 8),
       PreferencesData.getFloat("serial.stopbits", 1),
-      !BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"),
-      !BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true"));
+      !BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
+      !BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
   }
 
   public static boolean touchForCDCReset(String iname) throws SerialException {