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

simgear/props/props.cxx: fixed deadlock in SGPropertyNode::addChildren().

Browse Source 
Was causing fatal "Resource deadlock avoided" error with crj700.
This commit is contained in:
Julian Smith 2021-09-05 15:53:21 +01:00
parent 876e5534fd
commit a68a0b1ccb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
simgear/props/props.cxx
View File

@ -282,7 +282,7 @@ struct SGPropertyLock
<< "\n"; << "\n";
ret = default_; ret = default_;
} }
std::cerr << __FILE__ << ":" << __LINE__ << ":" if (0) std::cerr << __FILE__ << ":" << __LINE__ << ":"
<< " name=" << name << " name=" << name
<< " value=" << (value ? value : "<unset>") << " value=" << (value ? value : "<unset>")
<< " returning: " << ret << " returning: " << ret
@ -2480,7 +2480,7 @@ SGPropertyNode::addChildren( const std::string& name,
SGPropertyNode_ptr node; SGPropertyNode_ptr node;
node = new SGPropertyNode(name, index, this); node = new SGPropertyNode(name, index, this);
SGPropertyNodeImpl::appendNode(exclusive, *this, node); SGPropertyNodeImpl::appendNode(exclusive, *this, node);
fireChildAdded(node); SGPropertyNodeImpl::fireChildAdded(exclusive, *this, this /*parent*/, node);
nodes.push_back(node); nodes.push_back(node);
} }
} }