From: James Turner Date: Mon, 19 Nov 2012 23:22:45 +0000 (+0000) Subject: Allow a default name when adding subsystems. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cabb2a419f735d6646a97a8df7ec1aa5b1f84ede;p=flightgear.git Allow a default name when adding subsystems. --- diff --git a/src/Main/subsystemFactory.cxx b/src/Main/subsystemFactory.cxx index c7675d682..85e71456c 100644 --- a/src/Main/subsystemFactory.cxx +++ b/src/Main/subsystemFactory.cxx @@ -124,12 +124,18 @@ do_add_subsystem (const SGPropertyNode * arg) { std::string subsystem(arg->getStringValue("subsystem")); std::string name = arg->getStringValue("name"); - if (subsystem.empty() || name.empty()) { + if (subsystem.empty()) { SG_LOG(SG_GENERAL, SG_ALERT, "do_add_subsystem:" << "no subsystem/name supplied"); return false; } + + if (name.empty()) { + // default name is simply the subsytem's name + name = subsystem; + } + if (globals->get_subsystem_mgr()->get_subsystem(name)) { SG_LOG(SG_GENERAL, SG_ALERT, "do_add_subsystem:" << "duplicate subsystem name:" << name);