Fix adeadlock (or rather NDEADLCK)
ControlProtocolManager::set_state() already takes the protocols_lock. However effectively this is a NO-OP. During ::set_state no CPI should be instantiated and ControlProtocolManager::teardown() returns early.
This commit is contained in:
parent
bdd960cd99
commit
661d258687
@ -469,7 +469,7 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
|
||||
}
|
||||
} else {
|
||||
if (_session) {
|
||||
teardown (*cpi, true);
|
||||
teardown (*cpi, false);
|
||||
} else {
|
||||
cpi->requested = false;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user