fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of git@gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Durk Talsma 2010-07-27 20:21:31 +02:00
commit 2f4b6d2168
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Autopilot/autopilot.cxx
View file

@ -93,11 +93,16 @@ void Autopilot::add_component( Component * component )
{ {
if( component == NULL ) return; if( component == NULL ) return;
// check for duplicate name
std::string name = component->get_name(); std::string name = component->get_name();
if( get_subsystem( name.c_str() ) != NULL ) { for( unsigned i = 0; get_subsystem( name.c_str() ) != NULL; i++ ) {
SG_LOG( SG_ALL, SG_ALERT, "Duplicate autopilot component " << name << " ignored" ); ostringstream buf;
return; buf << name << "_" << i;
name = buf.str();
} }
if( name != component->get_name() )
SG_LOG( SG_ALL, SG_ALERT, "Duplicate autopilot component " << component->get_name() << ", renamed to " << name );
set_subsystem( name.c_str(), component ); set_subsystem( name.c_str(), component );
} }

12
src/Autopilot/autopilotgroup.cxx
View file

@ -177,6 +177,18 @@ void FGXMLAutopilotGroup::init()
apName = buf.str(); apName = buf.str();
} }
{
// check for duplicate names
string name = apName;
for( unsigned i = 0; get_subsystem( apName.c_str() ) != NULL; i++ ) {
ostringstream buf;
buf << apName << "_" << i;
apName = buf.str();
}
if( apName != name )
SG_LOG( SG_ALL, SG_ALERT, "Duplicate autopilot component " << name << ", renamed to " << apName );
}
if( get_subsystem( apName.c_str() ) != NULL ) { if( get_subsystem( apName.c_str() ) != NULL ) {
SG_LOG( SG_ALL, SG_ALERT, "Duplicate autopilot configuration name " << apName << " ignored" ); SG_LOG( SG_ALL, SG_ALERT, "Duplicate autopilot configuration name " << apName << " ignored" );
continue; continue;