diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-23 13:04:08 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:41 -0400 |
commit | d0f5958542a54bb7d463323be532e48540c84789 (patch) | |
tree | 1a36f4accc7db5607a100e0f097d57afb2aac574 /libs/ardour/solo_isolate_control.cc | |
parent | 0d62997eabf08397ea2c0c70e808abd4e79bcdbd (diff) |
fix chaining of masters for boolean controls
Diffstat (limited to 'libs/ardour/solo_isolate_control.cc')
-rw-r--r-- | libs/ardour/solo_isolate_control.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/solo_isolate_control.cc b/libs/ardour/solo_isolate_control.cc index a913a9810e..25bb5e723e 100644 --- a/libs/ardour/solo_isolate_control.cc +++ b/libs/ardour/solo_isolate_control.cc @@ -146,8 +146,7 @@ double SoloIsolateControl::get_value () const { if (slaved()) { - Glib::Threads::RWLock::ReaderLock lm (master_lock); - return get_masters_value_locked () ? 1.0 : 0.0; + return solo_isolated() || get_masters_value (); } if (_list && boost::dynamic_pointer_cast<AutomationList>(_list)->automation_playback()) { @@ -155,7 +154,7 @@ SoloIsolateControl::get_value () const return AutomationControl::get_value(); } - return solo_isolated () ? 1.0 : 0.0; + return solo_isolated (); } int |