mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-16 00:34:19 +00:00
Code Activity

Projucer: Removed the jobNeedsRunningAgain logic from AvailableModuleList's ModuleScannerJob as it was causing the job to hang when the module was found in the root directory

Browse source
This commit is contained in:
ed 2018-09-10 10:54:54 +01:00
parent 56022b6680
commit 8495d429ff
1 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
extras/Projucer/Source/Project/jucer_Module.cpp
View file

@ -125,7 +125,7 @@ static bool tryToAddModuleFromFolder (const File& path, ModuleIDAndFolderList& l
return false;
}
static bool addAllModulesInSubfoldersRecursively (const File& path, int depth, ModuleIDAndFolderList& list)
static void addAllModulesInSubfoldersRecursively (const File& path, int depth, ModuleIDAndFolderList& list)
{
if (depth > 0)
{
@ -133,30 +133,23 @@ static bool addAllModulesInSubfoldersRecursively (const File& path, int depth, M
{
if (auto* job = ThreadPoolJob::getCurrentThreadPoolJob())
if (job->shouldExit())
return false;
return;
auto childPath = iter.getFile().getLinkedTarget();
if (! tryToAddModuleFromFolder (childPath, list))
if (! addAllModulesInSubfoldersRecursively (childPath, depth - 1, list))
return false;
addAllModulesInSubfoldersRecursively (childPath, depth - 1, list);
}
}
return true;
}
static bool addAllModulesInFolder (const File& path, ModuleIDAndFolderList& list)
static void addAllModulesInFolder (const File& path, ModuleIDAndFolderList& list)
{
bool exitedBeforeCompletion = false;
if (! tryToAddModuleFromFolder (path, list))
{
int subfolders = 3;
exitedBeforeCompletion = addAllModulesInSubfoldersRecursively (path, subfolders, list);
addAllModulesInSubfoldersRecursively (path, subfolders, list);
}
return exitedBeforeCompletion;
}
static void sort (ModuleIDAndFolderList& listToSort)
@ -182,11 +175,13 @@ struct ModuleScannerJob : public ThreadPoolJob
ModuleIDAndFolderList list;
for (auto& p : pathsToScan)
if (! addAllModulesInFolder (p, list))
return jobNeedsRunningAgain;
addAllModulesInFolder (p, list);
sort (list);
completionCallback (list);
if (! shouldExit())
{
sort (list);
completionCallback (list);
}
return jobHasFinished;
}