ardour/livetrax
13
0
Fork 0
Code

fix deadlock when removing subgroup bus w/sends.

Browse Source 
...and potentially other route removals that involve
processor changes.
This commit is contained in:
Robin Gareus 2015-10-15 13:49:35 +02:00
parent 696b89b71a
commit 159d23be9f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/session.cc
View File

@ -2064,6 +2064,10 @@ Session::resort_routes ()
return;
}
if (_route_deletion_in_progress) {
return;
}
{
RCUWriter<RouteList> writer (routes);
boost::shared_ptr<RouteList> r = writer.get_copy ();
@ -3363,9 +3367,8 @@ Session::add_internal_send (boost::shared_ptr<Route> dest, boost::shared_ptr<Pro
void
Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
{
PBD::Unwinder<bool> uw_flag (_route_deletion_in_progress, true);
{ // RCU Writer scope
PBD::Unwinder<bool> uw_flag (_route_deletion_in_progress, true);
RCUWriter<RouteList> writer (routes);
boost::shared_ptr<RouteList> rs = writer.get_copy ();