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

Projucer: Fixed a deadlock that would occur when saving projects from the command line after adding the MessageManagerLock to Project::Item::loadAsImageFile()

Browse source
This commit is contained in:
ed 2017-10-17 14:17:44 +01:00
parent 43cb624a85
commit 3544f30c90
1 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h
View file

@ -96,7 +96,7 @@ public:
writeBinaryDataFiles();
writeAppHeader (modules);
writeModuleCppWrappers (modules);
writeProjects (modules, specifiedExporterToSave);
writeProjects (modules, specifiedExporterToSave, ! showProgressBox);
writeAppConfigFile (modules, appConfigUserContent); // (this is repeated in case the projects added anything to it)
if (generatedCodeFolder.exists())
@ -659,7 +659,7 @@ private:
void writePluginCharacteristicsFile();
void writeProjects (const OwnedArray<LibraryModule>& modules, const String& specifiedExporterToSave)
void writeProjects (const OwnedArray<LibraryModule>& modules, const String& specifiedExporterToSave, bool isCommandLineApp)
{
ThreadPool threadPool;
@ -694,7 +694,10 @@ private:
generatedFilesGroup.sortAlphabetically (true, true);
exporter->getAllGroups().add (generatedFilesGroup);
threadPool.addJob (new ExporterJob (*this, exporter.exporter.release(), modules), true);
if (isCommandLineApp)
saveExporter (exporter.exporter, modules);
else
threadPool.addJob (new ExporterJob (*this, exporter.exporter.release(), modules), true);
}
else
{
@ -707,8 +710,22 @@ private:
addError (saveError.message);
}
while (threadPool.getNumJobs() > 0)
Thread::sleep (10);
if (! isCommandLineApp)
while (threadPool.getNumJobs() > 0)
Thread::sleep (10);
}
void saveExporter (ProjectExporter* exporter, const OwnedArray<LibraryModule>& modules)
{
try
{
exporter->create (modules);
std::cout << "Finished saving: " << exporter->getName() << std::endl;
}
catch (ProjectExporter::SaveError& error)
{
addError (error.message);
}
}
class ExporterJob : public ThreadPoolJob
@ -723,16 +740,7 @@ private:
JobStatus runJob() override
{
try
{
exporter->create (modules);
std::cout << "Finished saving: " << exporter->getName() << std::endl;
}
catch (ProjectExporter::SaveError& error)
{
owner.addError (error.message);
}
owner.saveExporter (exporter, modules);
return jobHasFinished;
}