Skip to content

Commit f2595d0

Browse files
committed
Move the check into setLibrariesFolders()
1 parent 234c19f commit f2595d0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,10 @@ private void parseIndex(File file) throws IOException {
102102
}
103103

104104
public void setLibrariesFolders(List<File> _librariesFolders) {
105-
librariesFolders = _librariesFolders;
106-
rescanLibraries();
105+
if (librariesFolders != _librariesFolders && !librariesFolders.equals(_librariesFolders)) {
106+
librariesFolders = _librariesFolders;
107+
rescanLibraries();
108+
}
107109
}
108110

109111
public List<File> getLibrariesFolders() {

arduino-core/src/processing/app/BaseNoGui.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -679,9 +679,7 @@ static public void onBoardOrPortChange() {
679679
// Libraries located in the latest folders on the list can override
680680
// other libraries with the same name.
681681
librariesIndexer.setSketchbookLibrariesFolder(getSketchbookLibrariesFolder());
682-
if (librariesIndexer.getLibrariesFolders() == null || !librariesIndexer.getLibrariesFolders().equals(librariesFolders)) {
683-
librariesIndexer.setLibrariesFolders(librariesFolders);
684-
}
682+
librariesIndexer.setLibrariesFolders(librariesFolders);
685683

686684
populateImportToLibraryTable();
687685
}

0 commit comments

Comments
 (0)