Skip to content

Commit 350adb9

Browse files
author
Federico Fissore
committed
Also SerialDiscovery was affected by bug found at 40535df. Fixes #2892
1 parent 40535df commit 350adb9

File tree

4 files changed

+7
-0
lines changed

4 files changed

+7
-0
lines changed

Diff for: arduino-core/src/cc/arduino/packages/discoverers/serial/SerialBoardsLister.java

+4
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ public void start(Timer timer) {
5555

5656
@Override
5757
public void run() {
58+
if (BaseNoGui.packages == null) {
59+
return;
60+
}
61+
5862
Platform platform = BaseNoGui.getPlatform();
5963
if (platform == null) {
6064
return;

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

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public String getName() {
122122

123123
@Override
124124
public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
125+
assert packages != null;
125126
ByteArrayOutputStream baos = new ByteArrayOutputStream();
126127
Executor executor = new CollectStdOutExecutor(baos);
127128

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

+1
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ public String getName() {
191191

192192
@Override
193193
public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
194+
assert packages != null;
194195
if (devicesListOutput == null) {
195196
return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
196197
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ public String getName() {
286286

287287
@Override
288288
public Map<String, Object> resolveDeviceAttachedTo(String serial, Map<String, TargetPackage> packages, String devicesListOutput) {
289+
assert packages != null;
289290
if (devicesListOutput == null) {
290291
return super.resolveDeviceAttachedTo(serial, packages, devicesListOutput);
291292
}

0 commit comments

Comments
 (0)