From 302e4a6166a5bef2a92df8ef69547f5a1c4facc0 Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Thu, 4 Jul 2019 09:40:24 +0100
Subject: [PATCH] Projucer:  Prevent duplicate module headers being added to
 the project when copying module files locally

---
 extras/Projucer/Source/Project/jucer_Module.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/extras/Projucer/Source/Project/jucer_Module.cpp b/extras/Projucer/Source/Project/jucer_Module.cpp
index 6683d4ee17..e33a28f5bc 100644
--- a/extras/Projucer/Source/Project/jucer_Module.cpp
+++ b/extras/Projucer/Source/Project/jucer_Module.cpp
@@ -520,11 +520,16 @@ void LibraryModule::addBrowseableCode (ProjectExporter& exporter, const Array<Fi
     if (sourceFiles.isEmpty())
         findBrowseableFiles (localModuleFolder, sourceFiles);
 
-    auto sourceGroup = Project::Item::createGroup (exporter.getProject(), getID(), "__mainsourcegroup" + getID(), false);
-
+    auto sourceGroup       = Project::Item::createGroup (exporter.getProject(), getID(), "__mainsourcegroup" + getID(), false);
     auto moduleFromProject = exporter.getModuleFolderRelativeToProject (getID());
+    auto moduleHeader      = moduleInfo.getHeader();
 
-    auto moduleHeader = moduleInfo.getHeader();
+    auto& project = exporter.getProject();
+
+    if (project.getEnabledModules().shouldCopyModuleFilesLocally (getID()).getValue())
+        moduleHeader = project.getLocalModuleFolder (getID()).getChildFile (moduleHeader.getFileName());
+
+    auto isModuleHeader = [&] (const File& f)  { return f.getFileName() == moduleHeader.getFileName(); };
 
     for (auto& sourceFile : sourceFiles)
     {
@@ -532,10 +537,8 @@ void LibraryModule::addBrowseableCode (ProjectExporter& exporter, const Array<Fi
 
         // (Note: in exporters like MSVC we have to avoid adding the same file twice, even if one of those instances
         // is flagged as being excluded from the build, because this overrides the other and it fails to compile)
-        if ((exporter.canCopeWithDuplicateFiles() || ! compiled.contains (sourceFile)) && sourceFile != moduleHeader)
-            addFileWithGroups (sourceGroup,
-                               moduleFromProject.getChildFile (pathWithinModule),
-                               pathWithinModule);
+        if ((exporter.canCopeWithDuplicateFiles() || ! compiled.contains (sourceFile)) && ! isModuleHeader (sourceFile))
+            addFileWithGroups (sourceGroup, moduleFromProject.getChildFile (pathWithinModule), pathWithinModule);
     }
 
     sourceGroup.sortAlphabetically (true, true);