diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.cpp index 75228b76c6..32315c10f3 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.cpp @@ -733,7 +733,7 @@ void ProjectSaver::writeProjects (const OwnedArray& modules, Proj if (ProjucerApplication::getApp().isRunningCommandLine) saveExporter (*exporter, modules); else - threadPool.addJob (new ExporterJob (*this, *exporter, modules), true); + threadPool.addJob ([this, &exporter, &modules] { saveExporter (*exporter, modules); }); } else { @@ -806,8 +806,12 @@ void ProjectSaver::saveExporter (ProjectExporter& exporter, const OwnedArrayisThisTheMessageThread()) + std::cout << outputString << std::endl; + else + MessageManager::callAsync ([outputString] { std::cout << outputString << std::endl; }); } } catch (build_tools::SaveError& error) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h index a820ebe5f6..2dc04f659d 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectSaver.h @@ -65,31 +65,6 @@ private: JUCE_DECLARE_NON_COPYABLE (SaveThreadWithProgressWindow) }; - class ExporterJob : public ThreadPoolJob - { - public: - ExporterJob (ProjectSaver& ps, ProjectExporter& pe, const OwnedArray& modulesList) - : ThreadPoolJob ("export"), - owner (ps), - exporter (pe), - modules (modulesList) - { - } - - JobStatus runJob() override - { - owner.saveExporter (exporter, modules); - return jobHasFinished; - } - - private: - ProjectSaver& owner; - ProjectExporter& exporter; - const OwnedArray& modules; - - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ExporterJob) - }; - //============================================================================== Project::Item saveGeneratedFile (const String& filePath, const MemoryOutputStream& newData); bool replaceFileIfDifferent (const File& f, const MemoryOutputStream& newData);