diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index ba41f0cce8..62906c718d 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -61,10 +61,6 @@ Project::Project (const File& f) initialiseMainGroup(); initialiseAudioPluginValues(); - coalescePluginFormatValues(); - coalescePluginCharacteristicsValues(); - updatePluginCategories(); - parsedPreprocessorDefs = parsePreprocessorDefs (preprocessorDefsValue.get()); getModules().sortAlphabetically(); @@ -380,15 +376,23 @@ void Project::updatePluginCategories() { auto aaxCategory = projectRoot.getProperty (Ids::pluginAAXCategory, {}).toString(); - if (aaxCategory.isNotEmpty()) + if (getAllAAXCategoryVars().contains (aaxCategory)) + pluginAAXCategoryValue = aaxCategory; + else if (getAllAAXCategoryStrings().contains (aaxCategory)) pluginAAXCategoryValue = Array (getAllAAXCategoryVars()[getAllAAXCategoryStrings().indexOf (aaxCategory)]); + else + pluginAAXCategoryValue.resetToDefault(); } { auto rtasCategory = projectRoot.getProperty (Ids::pluginRTASCategory, {}).toString(); - if (rtasCategory.isNotEmpty()) + if (getAllRTASCategoryVars().contains (rtasCategory)) + pluginRTASCategoryValue = rtasCategory; + else if (getAllRTASCategoryStrings().contains (rtasCategory)) pluginRTASCategoryValue = Array (getAllRTASCategoryVars()[getAllRTASCategoryStrings().indexOf (rtasCategory)]); + else + pluginRTASCategoryValue.resetToDefault(); } { @@ -396,6 +400,8 @@ void Project::updatePluginCategories() if (vstCategory.isNotEmpty() && getAllVSTCategoryStrings().contains (vstCategory)) pluginVSTCategoryValue = Array (vstCategory); + else + pluginVSTCategoryValue.resetToDefault(); } { @@ -410,6 +416,10 @@ void Project::updatePluginCategories() else if (getAllAUMainTypeStrings().contains (auMainType)) pluginAUMainTypeValue = Array (getAllAUMainTypeVars()[getAllAUMainTypeStrings().indexOf (auMainType)]); } + else + { + pluginAUMainTypeValue.resetToDefault(); + } } }