From bc1a0937104cc2596640d93c95f6fabb3dd5be35 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 10 Jul 2013 13:49:51 +0200 Subject: [PATCH] amend to 212d2ac5d (port add/remove signals) fix deadlock when updating audio/midi connection matrix during session-close or on exit. (Note: this still can cause a crash if the route goes away while the iterator in the connection-matrix still has an index of it) --- libs/ardour/bundle.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index cf393644fc..0ac62d7076 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -206,6 +206,7 @@ Bundle::remove_channel (uint32_t ch) Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.erase (_channel.begin () + ch); + lm.release(); emit_changed (ConfigurationChanged); } @@ -217,6 +218,7 @@ Bundle::remove_channels () _channel.clear (); + lm.release(); emit_changed (ConfigurationChanged); } -- 2.30.2