From 780902b4927d72c757fc0bc9d63fc3e65d21bcfc Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 18 Jan 2018 09:44:37 +0000 Subject: [PATCH] Projucer: Fixed a bug where preprocessor definitions weren't being parsed initially and fixed a typo --- extras/Projucer/Source/Project/jucer_Project.cpp | 10 +++++++--- extras/Projucer/Source/Project/jucer_Project.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 52c2b46f3b..c08782854f 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -59,10 +59,12 @@ Project::Project (const File& f) moveOldPropertyFromProjectToAllExporters (Ids::bigIcon); moveOldPropertyFromProjectToAllExporters (Ids::smallIcon); - intialiseProjectValues(); + initialiseProjectValues(); initialiseMainGroup(); initialiseAudioPluginValues(); + parsedPreprocessorDefs = parsePreprocessorDefs (preprocessorDefsValue.get()); + getModules().sortAlphabetically(); projectRoot.addListener (this); @@ -170,7 +172,7 @@ void Project::initialiseMainGroup() getMainGroup().initialiseMissingProperties(); } -void Project::intialiseProjectValues() +void Project::initialiseProjectValues() { projectNameValue.referTo (projectRoot, Ids::name, getUndoManagerFor (projectRoot), "JUCE Project"); projectUIDValue.referTo (projectRoot, Ids::ID, getUndoManagerFor (projectRoot), createAlphaNumericUID()); @@ -412,10 +414,12 @@ Result Project::loadDocument (const File& file) enabledModulesList.reset(); projectRoot = newTree; - intialiseProjectValues(); + initialiseProjectValues(); initialiseMainGroup(); initialiseAudioPluginValues(); + parsedPreprocessorDefs = parsePreprocessorDefs (preprocessorDefsValue.get()); + removeDefunctExporters(); updateOldModulePaths(); setChangedFlag (false); diff --git a/extras/Projucer/Source/Project/jucer_Project.h b/extras/Projucer/Source/Project/jucer_Project.h index 80290e60f4..1261aeabdb 100644 --- a/extras/Projucer/Source/Project/jucer_Project.h +++ b/extras/Projucer/Source/Project/jucer_Project.h @@ -356,7 +356,7 @@ private: StringPairArray parsedPreprocessorDefs; //============================================================================== - void intialiseProjectValues(); + void initialiseProjectValues(); void initialiseMainGroup(); void initialiseAudioPluginValues();