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.

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 6a7bdfb3cb97ba7a3f68741d9cdf065d6f39b60c..014c2209d68801cb5a205230e8c926bb9ca041ff 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -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;
                                        }