From d3c43b88aed56aced96f9529320929ba4cc94a1b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 23 Feb 2017 22:53:50 +0100 Subject: fix solo + mute controls when slaved clamp/scale by masters only applies to non-boolean controls --- libs/ardour/slavable_automation_control.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs/ardour/slavable_automation_control.cc') diff --git a/libs/ardour/slavable_automation_control.cc b/libs/ardour/slavable_automation_control.cc index a1b9d8064d..36e72ba51a 100644 --- a/libs/ardour/slavable_automation_control.cc +++ b/libs/ardour/slavable_automation_control.cc @@ -98,7 +98,8 @@ SlavableAutomationControl::get_value_locked() const void SlavableAutomationControl::actually_set_value (double value, PBD::Controllable::GroupControlDisposition gcd) { - { + if (!_desc.toggled) { + Glib::Threads::RWLock::WriterLock lm (master_lock); if (!_masters.empty()) { -- cgit v1.2.3