diff options
Diffstat (limited to 'libs/ardour/control_protocol_manager.cc')
| -rw-r--r-- | libs/ardour/control_protocol_manager.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 724d60c389..e94829898a 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -121,6 +121,7 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi) return 0; } + Glib::Mutex::Lock lm (protocols_lock); control_protocols.push_back (cpi.protocol); @@ -152,13 +153,6 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi) } else { cerr << "Programming error: ControlProtocolManager::teardown() called for " << cpi.name << ", but it was not found in control_protocols" << endl; } - - list<ControlProtocolInfo*>::iterator p2 = find (control_protocol_info.begin(), control_protocol_info.end(), &cpi); - if (p2 != control_protocol_info.end()) { - control_protocol_info.erase (p2); - } else { - cerr << "Programming error: ControlProtocolManager::teardown() called for " << cpi.name << ", but it was not found in control_protocol_info" << endl; - } } cpi.protocol = 0; |