diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index e676ace124..8b395fa333 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -41,27 +41,14 @@ Project::Project (const File& f) "Save Jucer project") { Logger::writeToLog ("Loading project: " + f.getFullPathName()); - setFile (f); - removeDefunctExporters(); - exporterPathsModuleList.reset (new AvailableModuleList()); - updateOldModulePaths(); - updateOldStyleConfigList(); - setCppVersionFromOldExporterSettings(); - moveOldPropertyFromProjectToAllExporters (Ids::bigIcon); - moveOldPropertyFromProjectToAllExporters (Ids::smallIcon); + setFile (f); initialiseProjectValues(); initialiseMainGroup(); initialiseAudioPluginValues(); - parsedPreprocessorDefs = parsePreprocessorDefs (preprocessorDefsValue.get()); - - getEnabledModules().sortAlphabetically(); - - projectRoot.addListener (this); - - compileEngineSettings.reset (new CompileEngineSettings (projectRoot)); + exporterPathsModuleList.reset (new AvailableModuleList()); setChangedFlag (false); modificationTime = getFile().getLastModificationTime(); @@ -579,7 +566,9 @@ Result Project::loadDocument (const File& file) registerRecentFile (file); enabledModuleList.reset(); + projectRoot = newTree; + projectRoot.addListener (this); initialiseProjectValues(); initialiseMainGroup(); @@ -591,8 +580,15 @@ Result Project::loadDocument (const File& file) parsedPreprocessorDefs = parsePreprocessorDefs (preprocessorDefsValue.get()); + setCppVersionFromOldExporterSettings(); + removeDefunctExporters(); updateOldModulePaths(); + updateOldStyleConfigList(); + moveOldPropertyFromProjectToAllExporters (Ids::bigIcon); + moveOldPropertyFromProjectToAllExporters (Ids::smallIcon); + getEnabledModules().sortAlphabetically(); + setChangedFlag (false); if (! ProjucerApplication::getApp().isRunningCommandLine) diff --git a/extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h b/extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h index 6e92e56524..b443bf27fc 100644 --- a/extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h +++ b/extras/Projucer/Source/Wizards/jucer_NewProjectWizardComponent.h @@ -422,13 +422,11 @@ public: } auto projectDir = fileBrowser.getSelectedFile (0); - std::unique_ptr project (wizard->runWizard (*this, projectName.getText(), - projectDir, - modulesPathBox.isUsingGlobalPaths)); + std::unique_ptr project (wizard->runWizard (*this, projectName.getText(), projectDir, modulesPathBox.isUsingGlobalPaths)); if (project != nullptr) { - mw->setProject (std::move (project)); + mw->openFile (project->getFile()); getAppSettings().lastWizardFolder = projectDir.getParentDirectory(); } }