From 0a8e7a14f149534076455d9dd5fe17c44285686c Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 3 Oct 2016 11:07:10 +0200
Subject: [PATCH] Make sure DiscoveryManager is not null when calling it

Solves #5413
---
 arduino-core/src/processing/app/BaseNoGui.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java
index f264e7376..482daa863 100644
--- a/arduino-core/src/processing/app/BaseNoGui.java
+++ b/arduino-core/src/processing/app/BaseNoGui.java
@@ -210,6 +210,9 @@ public class BaseNoGui {
   }
 
   public static DiscoveryManager getDiscoveryManager() {
+    if (discoveryManager == null) {
+      discoveryManager = new DiscoveryManager();
+    }
     return discoveryManager;
   }
 
@@ -633,7 +636,9 @@ public class BaseNoGui {
       FileUtils.deleteIfExists(librariesIndexFile);
     }
 
-    discoveryManager = new DiscoveryManager();
+    if (discoveryManager == null) {
+      discoveryManager = new DiscoveryManager();
+    }
   }
 
   static protected void initPlatform() {