Avoid call rescanLibraries() twice #10228

Author: ricardojlrufino

app/test/cc/arduino/contributions/UpdatableLibraryTest.java

@@ -47,6 +47,7 @@ public void testUpdatableLibrary() throws Exception {
 
     folders.add(new UserLibraryFolder(SD121, Location.SKETCHBOOK));
     indexer.setLibrariesFolders(folders);
+    indexer.rescanLibraries();
 
     sdLib = indexer.getIndex().getInstalled("SD").get();
     assertTrue("SD lib is installed", sdLib.isLibraryInstalled());
@@ -74,6 +75,7 @@ public void testUpdatableLibraryWithBundled() throws Exception {
 
     folders.add(new UserLibraryFolder(Bridge170, Location.SKETCHBOOK));
     indexer.setLibrariesFolders(folders);
+    indexer.rescanLibraries();
 
     l = indexer.getIndex().getInstalled("Bridge").get();
     assertTrue("Bridge lib is installed", l.isLibraryInstalled());

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

@@ -114,9 +114,13 @@ private void parseIndex(File file) throws IOException {
   }
 
   public void setLibrariesFolders(List<UserLibraryFolder> folders) {
-    librariesFolders = folders;
-    rescanLibraries();
+      setLibrariesFolders(folders, false);
   }
+  
+  public void setLibrariesFolders(List<UserLibraryFolder> folders, boolean rescan) {
+      librariesFolders = folders;
+      if(rescan) rescanLibraries();
+    }
 
   public List<UserLibraryFolder> getLibrariesFolders() {
     return librariesFolders;

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

@@ -674,10 +674,11 @@ static public void onBoardOrPortChange() {
     // Scan for libraries in each library folder.
     // Libraries located in the latest folders on the list can override
     // other libraries with the same name.
-    librariesIndexer.setLibrariesFolders(librariesFolders);
+    librariesIndexer.setLibrariesFolders(librariesFolders, false);
     if (getTargetPlatform() != null) {
       librariesIndexer.setArchitecturePriority(getTargetPlatform().getId());
     }
+    
     librariesIndexer.rescanLibraries();
 
     populateImportToLibraryTable();