From a68a0b1ccbac36f65198c0d17ebd9d0e5bf54f08 Mon Sep 17 00:00:00 2001 From: Julian Smith Date: Sun, 5 Sep 2021 15:53:21 +0100 Subject: [PATCH] simgear/props/props.cxx: fixed deadlock in SGPropertyNode::addChildren(). Was causing fatal "Resource deadlock avoided" error with crj700. --- simgear/props/props.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx index 8b42ca6f..a1a00634 100755 --- a/simgear/props/props.cxx +++ b/simgear/props/props.cxx @@ -282,7 +282,7 @@ struct SGPropertyLock << "\n"; ret = default_; } - std::cerr << __FILE__ << ":" << __LINE__ << ":" + if (0) std::cerr << __FILE__ << ":" << __LINE__ << ":" << " name=" << name << " value=" << (value ? value : "") << " returning: " << ret @@ -2480,7 +2480,7 @@ SGPropertyNode::addChildren( const std::string& name, SGPropertyNode_ptr node; node = new SGPropertyNode(name, index, this); SGPropertyNodeImpl::appendNode(exclusive, *this, node); - fireChildAdded(node); + SGPropertyNodeImpl::fireChildAdded(exclusive, *this, this /*parent*/, node); nodes.push_back(node); } }