fly/flightgear
1
0
Fork 0
Code Activity

Allow a default name when adding subsystems.

Browse source
This commit is contained in:
James Turner 2012-11-19 23:22:45 +00:00
parent 93237f1b37
commit cabb2a419f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Main/subsystemFactory.cxx
View file

@ -124,12 +124,18 @@ do_add_subsystem (const SGPropertyNode * arg)
{ {
std::string subsystem(arg->getStringValue("subsystem")); std::string subsystem(arg->getStringValue("subsystem"));
std::string name = arg->getStringValue("name"); std::string name = arg->getStringValue("name");
if (subsystem.empty() || name.empty()) { if (subsystem.empty()) {
SG_LOG(SG_GENERAL, SG_ALERT, "do_add_subsystem:" SG_LOG(SG_GENERAL, SG_ALERT, "do_add_subsystem:"
<< "no subsystem/name supplied"); << "no subsystem/name supplied");
return false; return false;
} }
if (name.empty()) {
// default name is simply the subsytem's name
name = subsystem;
}
if (globals->get_subsystem_mgr()->get_subsystem(name)) { if (globals->get_subsystem_mgr()->get_subsystem(name)) {
SG_LOG(SG_GENERAL, SG_ALERT, "do_add_subsystem:" SG_LOG(SG_GENERAL, SG_ALERT, "do_add_subsystem:"
<< "duplicate subsystem name:" << name); << "duplicate subsystem name:" << name);