Commit 5edd2473 authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[MERGE]

parents 18bad8e9 adcf9fb1
......@@ -35,8 +35,18 @@ WConditionSet::WConditionSet():
WConditionSet::~WConditionSet()
{
// get write lock
boost::unique_lock<boost::shared_mutex> lock = boost::unique_lock<boost::shared_mutex>( m_conditionSetLock );
// clean conditions list
// NOTE: we need to disconnect here.
for ( ConditionConnectionMap::iterator it = m_conditionSet.begin(); it != m_conditionSet.end(); ++it )
{
( *it ).second.disconnect();
}
m_conditionSet.clear();
lock.unlock();
}
void WConditionSet::add( boost::shared_ptr< WCondition > condition )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment