fly/flightgear
1
0
Fork 0
Code Activity

Bugfix use of type checks in FGPositioned::findAllWithIdentSortedByRange

Browse source
This commit is contained in:
jmt 2009-10-01 16:50:54 +00:00 • committed by Tim Moore
parent 9ebd19babf
commit c08cc9693e
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Navaids/positioned.cxx
View file

@ -568,10 +568,17 @@ FGPositioned::findAllWithIdentSortedByRange(const std::string& aIdent, const SGG
List result; List result;
NamedIndexRange range = global_namedIndex.equal_range(aIdent); NamedIndexRange range = global_namedIndex.equal_range(aIdent);
for (; range.first != range.second; ++range.first) { for (; range.first != range.second; ++range.first) {
if (aFilter && !aFilter->pass(range.first->second)) { FGPositioned* candidate = range.first->second;
if (aFilter) {
if (aFilter->hasTypeRange() && !aFilter->passType(candidate->type())) {
continue; continue;
} }
if (!aFilter->pass(candidate)) {
continue;
}
}
result.push_back(range.first->second); result.push_back(range.first->second);
} }