fly/flightgear
1
0
Fork 0
Code Activity

Autopilot: don't warn on un-nmed APs

Browse source 
When no name is defined at all, suppress the 'duplicate name' warning.
This commit is contained in:
Automatic Release Builder 2020-09-29 17:44:36 +01:00 • committed by James Turner
parent 0f01b0cbb6
commit b38271f9ae
1 changed files with 12 additions and 5 deletions

17
src/Autopilot/autopilot.cxx
View file

@ -212,16 +212,23 @@ void Autopilot::add_component( Component * component, double updateInterval )
if( component == NULL ) return; if( component == NULL ) return;
// check for duplicate name // check for duplicate name
std::string name = component->subsystemId(); const auto originalName = string{component->subsystemId()};
for( unsigned i = 0; get_subsystem( name.c_str() ) != NULL; i++ ) { std::string name = originalName;
if (name.empty()) {
name = "unnamed_autopilot";
}
for( unsigned int i = 0; get_subsystem( name) != nullptr; i++ ) {
std::ostringstream buf; std::ostringstream buf;
buf << component->subsystemId() << "_" << i; buf << component->subsystemId() << "_" << i;
name = buf.str(); name = buf.str();
} }
if( name != component->subsystemId() )
SG_LOG( SG_AUTOPILOT, SG_DEV_WARN, "Duplicate autopilot component " << component->subsystemId() << ", renamed to " << name );
set_subsystem( name.c_str(), component, updateInterval ); if (!originalName.empty() && (name != originalName)) {
SG_LOG( SG_AUTOPILOT, SG_DEV_WARN, "Duplicate autopilot component " << originalName << ", renamed to " << name );
}
set_subsystem( name, component, updateInterval );
} }
void Autopilot::update( double dt ) void Autopilot::update( double dt )