Commit a3014775 authored by Ellen Dekkers's avatar Ellen Dekkers

Bugfix for ObjectIterator not skipping groups

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4045 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 81d08fc5
......@@ -63,10 +63,6 @@ ObjectIterator::ObjectIterator( IteratorRestriction _restriction , DataType _dat
while ( (currentPos != objectRoot()) && !dynamic_cast<BaseObjectData* > (currentPos) )
currentPos = currentPos->next();
if (currentPos == objectRoot())
return;
while ( (currentPos != objectRoot()) ) {
// Return only target objects if requested
......@@ -129,6 +125,10 @@ ObjectIterator& ObjectIterator::operator++() {
// Get the next element in the tree
currentPos = currentPos->next();
// Go through the tree and stop at the root node or if we found a baseObjectData Object
while ( (currentPos != objectRoot()) && !dynamic_cast<BaseObjectData* > (currentPos) )
currentPos = currentPos->next();
while ( (currentPos != objectRoot() ) ) {
// Return only target objects if requested
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment