Browse Source

Introjucer: added checking to avoid duplicate IDs in groups.

tags/2021-05-28
jules 13 years ago
parent
commit
276e7622a9
2 changed files with 9 additions and 3 deletions
  1. +2
    -2
      extras/Introjucer/Source/Project/jucer_Module.cpp
  2. +7
    -1
      extras/Introjucer/Source/Project/jucer_Project.cpp

+ 2
- 2
extras/Introjucer/Source/Project/jucer_Module.cpp View File

@@ -590,7 +590,7 @@ static bool exporterTargetMatches (const String& test, String target)
validTargets.addTokens (target, ",;", "");
validTargets.trim();
validTargets.removeEmptyStrings();
if (validTargets.size() == 0)
return true;
@@ -602,7 +602,7 @@ static bool exporterTargetMatches (const String& test, String target)
|| (target.startsWithChar ('!') && test != target.substring (1).trimStart()))
return true;
}
return false;
}


+ 7
- 1
extras/Introjucer/Source/Project/jucer_Project.cpp View File

@@ -707,7 +707,13 @@ Project::Item Project::Item::getOrCreateSubGroup (const String& name)
Project::Item Project::Item::addNewSubGroup (const String& name, int insertIndex)
{
Item group (createGroup (project, name, createGUID (getID() + name + String (getNumChildren()))));
String newID (createGUID (getID() + name + String (getNumChildren())));
int n = 0;
while (findItemWithID (newID).isValid())
newID = createGUID (newID + String (++n));
Item group (createGroup (project, name, newID));
jassert (canContain (group));
addChild (group, insertIndex);


Loading…
Cancel
Save