FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Error messages when installing property aliases fails.

Browse Source
This commit is contained in:
ThorstenB
2012-04-05 20:03:07 +02:00
parent 1a835a2e1b
commit 77909577e4
1 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/props/props.cxx
+33 -7
View File
@@ -778,13 +778,39 @@ SGPropertyNode::~SGPropertyNode ()
bool bool
SGPropertyNode::alias (SGPropertyNode * target) SGPropertyNode::alias (SGPropertyNode * target)
{ {
if (target == 0 || _type == props::ALIAS || _tied) if (target && (_type != props::ALIAS) && (!_tied))
return false; {
clearValue(); clearValue();
get(target); get(target);
_value.alias = target; _value.alias = target;
_type = props::ALIAS; _type = props::ALIAS;
return true; return true;
}
#if PROPS_STANDALONE
#else
if (!target)
{
SG_LOG(SG_GENERAL, SG_ALERT,
"Failed to create alias for " << getPath() << ". "
"The target property does not exist.");
}
else
if (_type == props::ALIAS)
{
SG_LOG(SG_GENERAL, SG_ALERT,
"Failed to create alias at " << target->getPath() << ". "
"Source "<< getPath() << " is also an alias. Unsupported recursion.");
}
else
if (_tied)
{
SG_LOG(SG_GENERAL, SG_ALERT, "Failed to create alias at " << target->getPath() << ". "
"Source " << getPath() << " is a tied property.");
}
#endif
return false;
} }