mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-29 02:40:05 +00:00
Code Activity

Projucer: Fixed a crash when creating new projects without using global paths and hide UI elements correctly when closing projects

Browse source
This commit is contained in:
ed 2020-04-22 10:19:47 +01:00
parent faed5b237b
commit 6ce02ad35f
6 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

17
extras/Projucer/Source/Project/jucer_Project.cpp
View file

@ -631,9 +631,8 @@ Result Project::loadDocument (const File& file)
compileEngineSettings.reset (new CompileEngineSettings (projectRoot));
exporterPathsModulesList.reset (new AvailableModulesList());
rescanExporterPathModules (! ProjucerApplication::getApp().isRunningCommandLine);
exporterPathsModulesList->addListener (this);
exporterPathsModulesList.addListener (this);
setCppVersionFromOldExporterSettings();
updateDeprecatedProjectSettings();
@ -2313,25 +2312,19 @@ static Array<File> getExporterModulePathsToScan (Project& project)
return files;
}
AvailableModulesList& Project::getExporterPathsModulesList()
{
jassert (exporterPathsModulesList != nullptr);
return *exporterPathsModulesList;
}
void Project::rescanExporterPathModules (bool async)
{
if (async)
exporterPathsModulesList->scanPathsAsync (getExporterModulePathsToScan (*this));
exporterPathsModulesList.scanPathsAsync (getExporterModulePathsToScan (*this));
else
exporterPathsModulesList->scanPaths (getExporterModulePathsToScan (*this));
exporterPathsModulesList.scanPaths (getExporterModulePathsToScan (*this));
}
AvailableModulesList::ModuleIDAndFolder Project::getModuleWithID (const String& id)
{
if (! getEnabledModules().shouldUseGlobalPath (id))
{
const auto& mod = exporterPathsModulesList->getModuleWithID (id);
const auto& mod = exporterPathsModulesList.getModuleWithID (id);
if (mod.second != File())
return mod;
@ -2344,7 +2337,7 @@ AvailableModulesList::ModuleIDAndFolder Project::getModuleWithID (const String&
if (m.first == id)
return m;
return exporterPathsModulesList->getModuleWithID (id);
return exporterPathsModulesList.getModuleWithID (id);
}
//==============================================================================