allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

amend a1b4f9b8ab - handle disconnecting from all masters

Browse Source
This commit is contained in:
Robin Gareus
2017-06-10 14:37:05 +02:00
parent d0307e10c9
commit f0d3121d6c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/ardour/slavable_automation_control.cc
View File

@@ -328,12 +328,12 @@ SlavableAutomationControl::master_going_away (boost::weak_ptr<AutomationControl>
void
SlavableAutomationControl::remove_master (boost::shared_ptr<AutomationControl> m)
{
masters_connections.erase (boost::weak_ptr<AutomationControl>(m));
pre_remove_master (m);
{
Glib::Threads::RWLock::WriterLock lm (master_lock);
masters_connections.erase (boost::weak_ptr<AutomationControl>(m));
if (!_masters.erase (m->id())) {
return;
}
@@ -386,6 +386,7 @@ SlavableAutomationControl::clear_masters ()
had_masters = true;
}
_masters.clear ();
masters_connections.clear ();
new_value = get_value_locked ();
}