diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp index 4714228361..faf45669b1 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp @@ -507,9 +507,7 @@ String ProjectExporter::getPathForModuleString (const String& moduleID) const if (id == Ids::defaultJuceModulePath) return getAppSettings().getStoredPath (Ids::defaultJuceModulePath).toString(); - return EnabledModuleList::findUserModuleFolder (moduleID, - getAppSettings().getStoredPath (Ids::defaultUserModulePath).toString(), - project).getFullPathName(); + return getAppSettings().getStoredPath (Ids::defaultUserModulePath).toString(); } return exporterPath; diff --git a/extras/Projucer/Source/Project/jucer_Module.cpp b/extras/Projucer/Source/Project/jucer_Module.cpp index 0587317a40..de8c4db2af 100644 --- a/extras/Projucer/Source/Project/jucer_Module.cpp +++ b/extras/Projucer/Source/Project/jucer_Module.cpp @@ -684,6 +684,24 @@ File EnabledModuleList::getModuleFolderFromPathIfItExists (const String& path, c return {}; } +File EnabledModuleList::findUserModuleFolder (const String& possiblePaths, const String& moduleID) +{ + auto paths = StringArray::fromTokens (possiblePaths, ";", {}); + + for (auto p : paths) + { + auto f = File::createFileWithoutCheckingPath (p.trim()); + if (f.exists()) + { + auto moduleFolder = getModuleFolderFromPathIfItExists (f.getFullPathName(), moduleID, project); + if (moduleFolder != File()) + return moduleFolder; + } + } + + return {}; +} + File EnabledModuleList::getModuleFolder (const String& moduleID) { if (shouldUseGlobalPath (moduleID).getValue()) @@ -691,7 +709,7 @@ File EnabledModuleList::getModuleFolder (const String& moduleID) if (isJuceModule (moduleID)) return getModuleFolderFromPathIfItExists (getAppSettings().getStoredPath (Ids::defaultJuceModulePath).toString(), moduleID, project); - return findUserModuleFolder (moduleID, getAppSettings().getStoredPath (Ids::defaultUserModulePath).toString(), project); + return findUserModuleFolder (moduleID, getAppSettings().getStoredPath (Ids::defaultUserModulePath).toString()); } auto paths = getAllPossibleModulePathsFromExporters (project); @@ -874,24 +892,6 @@ File EnabledModuleList::findDefaultModulesFolder (Project& project) return File::getCurrentWorkingDirectory(); } -File EnabledModuleList::findUserModuleFolder (const String& moduleID, const String& possiblePaths, const Project& project) -{ - auto paths = StringArray::fromTokens (possiblePaths, ";", {}); - - for (auto p : paths) - { - auto f = File::createFileWithoutCheckingPath (p.trim()); - if (f.exists()) - { - auto moduleFolder = getModuleFolderFromPathIfItExists (f.getFullPathName(), moduleID, project); - if (moduleFolder != File()) - return moduleFolder; - } - } - - return {}; -} - bool EnabledModuleList::isJuceModule (const String& moduleID) { static StringArray juceModuleIds = diff --git a/extras/Projucer/Source/Project/jucer_Module.h b/extras/Projucer/Source/Project/jucer_Module.h index 09fd6fc991..c6af1627af 100644 --- a/extras/Projucer/Source/Project/jucer_Module.h +++ b/extras/Projucer/Source/Project/jucer_Module.h @@ -138,7 +138,6 @@ public: static File findGlobalModulesFolder(); static File findDefaultModulesFolder (Project&); - static File findUserModuleFolder (const String& moduleID, const String& possiblePaths, const Project&); static bool isJuceModule (const String& moduleID); bool isModuleEnabled (const String& moduleID) const; @@ -179,6 +178,7 @@ private: UndoManager* getUndoManager() const { return project.getUndoManagerFor (state); } static File getModuleFolderFromPathIfItExists (const String& path, const String& moduleID, const Project&); + File findUserModuleFolder (const String& possiblePaths, const String& moduleID); JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (EnabledModuleList) };