diff options
author | Robin Gareus <robin@gareus.org> | 2017-07-28 20:15:15 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-07-28 20:15:15 +0200 |
commit | b5e0b5b09f41d2529bf4ba37f69602f914828e58 (patch) | |
tree | 9b29192370601cd67ea802bd6c3cde7e6b387f6c /libs/surfaces/mackie | |
parent | 964b88e651ac3324d85f735aad3faba226b582f6 (diff) |
PortManager::unregister_port() must be called with process lock
This fixes "Failed to register <surface> port" when re-loading a session.
Diffstat (limited to 'libs/surfaces/mackie')
-rw-r--r-- | libs/surfaces/mackie/surface_port.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc index 4ecb565735..b6bc26cc77 100644 --- a/libs/surfaces/mackie/surface_port.cc +++ b/libs/surfaces/mackie/surface_port.cc @@ -92,6 +92,7 @@ SurfacePort::~SurfacePort() } else { if (_async_in) { DEBUG_TRACE (DEBUG::MackieControl, string_compose ("unregistering input port %1\n", _async_in->name())); + Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock()); AudioEngine::instance()->unregister_port (_async_in); _async_in.reset ((ARDOUR::Port*) 0); } @@ -99,6 +100,7 @@ SurfacePort::~SurfacePort() if (_async_out) { _output_port->drain (10000, 250000); DEBUG_TRACE (DEBUG::MackieControl, string_compose ("unregistering output port %1\n", _async_out->name())); + Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock()); AudioEngine::instance()->unregister_port (_async_out); _async_out.reset ((ARDOUR::Port*) 0); } |