From e6c85b8a086f22d890f2fa8bb834451b4be9a294 Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 10 Jul 2018 12:57:51 +0100 Subject: [PATCH] Projucer: Increase the subfolder recursion depth when searching for modules and fix a couple of places where paths containing ~ were not being parsed correctly --- extras/Projucer/Source/Project/jucer_Module.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extras/Projucer/Source/Project/jucer_Module.cpp b/extras/Projucer/Source/Project/jucer_Module.cpp index 233bc9de18..9a5ab7f868 100644 --- a/extras/Projucer/Source/Project/jucer_Module.cpp +++ b/extras/Projucer/Source/Project/jucer_Module.cpp @@ -174,7 +174,7 @@ Result ModuleList::addAllModulesInFolder (const File& path) { if (! tryToAddModuleFromFolder (path)) { - int subfolders = 2; + int subfolders = 5; return addAllModulesInSubfoldersRecursively (path, subfolders); } @@ -324,6 +324,8 @@ void ModuleList::scanGlobalUserModulePath() for (auto p : paths) { + p = p.replace ("~", File::getSpecialLocation (File::userHomeDirectory).getFullPathName()); + auto f = File::createFileWithoutCheckingPath (p.trim()); if (f.exists()) addAllModulesInFolder (f); @@ -715,6 +717,8 @@ File EnabledModuleList::findUserModuleFolder (const String& possiblePaths, const for (auto p : paths) { + p = p.replace ("~", File::getSpecialLocation (File::userHomeDirectory).getFullPathName()); + auto f = File::createFileWithoutCheckingPath (p.trim()); if (f.exists()) {