mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-20 21:56:30 +01:00
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
1 changed files with 1 additions and 1 deletions
|
|
@ -469,7 +469,7 @@ ControlProtocolManager::set_state (const XMLNode& node, int /*version*/)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (_session) {
|
if (_session) {
|
||||||
teardown (*cpi, true);
|
teardown (*cpi, false);
|
||||||
} else {
|
} else {
|
||||||
cpi->requested = false;
|
cpi->requested = false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue