summaryrefslogtreecommitdiff
path: root/libs/surfaces/push2/push2.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-07-28 20:15:15 +0200
committerRobin Gareus <robin@gareus.org>2017-07-28 20:15:15 +0200
commitb5e0b5b09f41d2529bf4ba37f69602f914828e58 (patch)
tree9b29192370601cd67ea802bd6c3cde7e6b387f6c /libs/surfaces/push2/push2.cc
parent964b88e651ac3324d85f735aad3faba226b582f6 (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/push2/push2.cc')
-rw-r--r--libs/surfaces/push2/push2.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/surfaces/push2/push2.cc b/libs/surfaces/push2/push2.cc
index f29ff41d06..d884869048 100644
--- a/libs/surfaces/push2/push2.cc
+++ b/libs/surfaces/push2/push2.cc
@@ -294,8 +294,11 @@ Push2::ports_release ()
asp = dynamic_cast<AsyncMIDIPort*> (_output_port);
asp->drain (10000, 500000);
- AudioEngine::instance()->unregister_port (_async_in);
- AudioEngine::instance()->unregister_port (_async_out);
+ {
+ Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock());
+ AudioEngine::instance()->unregister_port (_async_in);
+ AudioEngine::instance()->unregister_port (_async_out);
+ }
_async_in.reset ((ARDOUR::Port*) 0);
_async_out.reset ((ARDOUR::Port*) 0);