Skip to content

Fix NPEs if no hardware core is installed #8857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2019
Merged

Fix NPEs if no hardware core is installed #8857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public void syncWithFilesystem() throws IOException {
}

private void syncBuiltInHardware() throws IOException {
if (index == null) {
if (index == null || builtInHardwareFolder == null) {
return;
}
for (File folder : builtInHardwareFolder.listFiles(ONLY_DIRS)) {
Expand Down
4 changes: 3 additions & 1 deletion arduino-core/src/processing/app/BaseNoGui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,9 @@ static public void onBoardOrPortChange() {
// Libraries located in the latest folders on the list can override
// other libraries with the same name.
librariesIndexer.setLibrariesFolders(librariesFolders);
librariesIndexer.setArchitecturePriority(getTargetPlatform().getId());
if (getTargetPlatform() != null) {
librariesIndexer.setArchitecturePriority(getTargetPlatform().getId());
}
librariesIndexer.rescanLibraries();

populateImportToLibraryTable();
Expand Down