From 18c0e37f4316ec1376e2e093a5614bd29cfa1e8a Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Tue, 4 Jul 2017 10:30:48 +0100
Subject: [PATCH] Projucer:  Always initially disable "Use global path" when
 adding a module from a specified folder

---
 extras/Projucer/Source/Project/jucer_Module.cpp | 7 ++++---
 extras/Projucer/Source/Project/jucer_Module.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/extras/Projucer/Source/Project/jucer_Module.cpp b/extras/Projucer/Source/Project/jucer_Module.cpp
index de8c4db2af..c0d27d084b 100644
--- a/extras/Projucer/Source/Project/jucer_Module.cpp
+++ b/extras/Projucer/Source/Project/jucer_Module.cpp
@@ -929,7 +929,7 @@ void EnabledModuleList::addModuleFromUserSelectedFile()
     if (fc.browseForDirectory())
     {
         lastLocation = fc.getResult();
-        addModuleOfferingToCopy (lastLocation);
+        addModuleOfferingToCopy (lastLocation, true);
     }
 }
 
@@ -958,7 +958,7 @@ void EnabledModuleList::addModuleInteractive (const String& moduleID)
         addModuleFromUserSelectedFile();
 }
 
-void EnabledModuleList::addModuleOfferingToCopy (const File& f)
+void EnabledModuleList::addModuleOfferingToCopy (const File& f, bool isFromUserSpecifiedFolder)
 {
     ModuleDescription m (f);
 
@@ -976,7 +976,8 @@ void EnabledModuleList::addModuleOfferingToCopy (const File& f)
         return;
     }
 
-    addModule (m.moduleFolder, areMostModulesCopiedLocally(), areMostModulesUsingGlobalPath());
+    addModule (m.moduleFolder, areMostModulesCopiedLocally(), isFromUserSpecifiedFolder ? false
+                                                                                        : areMostModulesUsingGlobalPath());
 }
 
 bool isJuceFolder (const File& f)
diff --git a/extras/Projucer/Source/Project/jucer_Module.h b/extras/Projucer/Source/Project/jucer_Module.h
index c6af1627af..60b41fe41e 100644
--- a/extras/Projucer/Source/Project/jucer_Module.h
+++ b/extras/Projucer/Source/Project/jucer_Module.h
@@ -155,7 +155,7 @@ public:
     void addModule (const File& moduleManifestFile, bool copyLocally, bool useGlobalPath);
     void addModuleInteractive (const String& moduleID);
     void addModuleFromUserSelectedFile();
-    void addModuleOfferingToCopy (const File&);
+    void addModuleOfferingToCopy (const File&, bool isFromUserSpecifiedFolder);
 
     StringArray getAllModules() const;
     StringArray getExtraDependenciesNeeded (const String& moduleID) const;