Skip to content

Commit 40535df

Browse files
author
Federico Fissore
committed
NetworkDiscovery was silently failing because packages werenìt ready yet. Fixes arduino#2837
1 parent b42c666 commit 40535df

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void serviceResolved(ServiceEvent serviceEvent) {
137137
}
138138

139139
String label = name + " at " + address;
140-
if (board != null) {
140+
if (board != null && BaseNoGui.packages != null) {
141141
String boardName = BaseNoGui.getPlatform().resolveDeviceByBoardID(BaseNoGui.packages, board);
142142
if (boardName != null) {
143143
label += " (" + boardName + ")";

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

+2
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ protected Map<String, Object> resolveDeviceByVendorIdProductId(Map<String, Targe
164164
}
165165

166166
public String resolveDeviceByBoardID(Map<String, TargetPackage> packages, String boardId) {
167+
assert packages != null;
168+
assert boardId != null;
167169
for (TargetPackage targetPackage : packages.values()) {
168170
for (TargetPlatform targetPlatform : targetPackage.getPlatforms().values()) {
169171
for (TargetBoard board : targetPlatform.getBoards().values()) {

0 commit comments

Comments
 (0)