ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix possible deadlock on session-close

Browse Source
This commit is contained in:
Robin Gareus 2015-08-28 15:45:52 +02:00
parent b6f51b2497
commit b0147a7767
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/route.cc
View File

@ -3101,14 +3101,21 @@ Route::remove_aux_or_listen (boost::shared_ptr<Route> route)
if (d && d->target_route() == route) {
rl.release ();
remove_processor (*x, &err, false);
if (remove_processor (*x, &err, false) > 0) {
rl.acquire ();
continue;
}
rl.acquire ();
/* list could have been demolished while we dropped the lock
so start over.
*/
goto again;
if (_session.engine().connected()) {
/* i/o processors cannot be removed if the engine is not running
* so don't live-loop in case the engine is N/A or dies
*/
goto again;
}
}
}
}