Skip to content

Commit 101677b

Browse files
committed
Fixed NPE introduced in 125846f
Fix #6552
1 parent 0fc235d commit 101677b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Diff for: arduino-core/src/processing/app/Serial.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -65,34 +65,34 @@ public Serial() throws SerialException {
6565
PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
6666
PreferencesData.getInteger("serial.databits", 8),
6767
PreferencesData.getFloat("serial.stopbits", 1),
68-
!BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"),
69-
!BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true"));
68+
!BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
69+
!BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
7070
}
7171

7272
public Serial(int irate) throws SerialException {
7373
this(PreferencesData.get("serial.port"), irate,
7474
PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
7575
PreferencesData.getInteger("serial.databits", 8),
7676
PreferencesData.getFloat("serial.stopbits", 1),
77-
!BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"),
78-
!BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true"));
77+
!BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
78+
!BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
7979
}
8080

8181
public Serial(String iname, int irate) throws SerialException {
8282
this(iname, irate, PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
8383
PreferencesData.getInteger("serial.databits", 8),
8484
PreferencesData.getFloat("serial.stopbits", 1),
85-
!BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"),
86-
!BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true"));
85+
!BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
86+
!BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
8787
}
8888

8989
public Serial(String iname) throws SerialException {
9090
this(iname, PreferencesData.getInteger("serial.debug_rate", 9600),
9191
PreferencesData.getNonEmpty("serial.parity", "N").charAt(0),
9292
PreferencesData.getInteger("serial.databits", 8),
9393
PreferencesData.getFloat("serial.stopbits", 1),
94-
!BaseNoGui.getBoardPreferences().get("serial.disableRTS").equalsIgnoreCase("true"),
95-
!BaseNoGui.getBoardPreferences().get("serial.disableDTR").equalsIgnoreCase("true"));
94+
!BaseNoGui.getBoardPreferences().getBoolean("serial.disableRTS"),
95+
!BaseNoGui.getBoardPreferences().getBoolean("serial.disableDTR"));
9696
}
9797

9898
public static boolean touchForCDCReset(String iname) throws SerialException {

0 commit comments

Comments
 (0)