diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-08-28 16:39:31 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-08-28 16:39:31 +0000 |
| commit | e7587ea0fbaf6aab5db7387b9c12a0fd956c8ec3 (patch) | |
| tree | 6dcdcc4e2597765bdf808d438779ec88b3438051 /gtk2_ardour | |
| parent | 383597b19bf61139de39dcec63c8a73eb34843ed (diff) | |
Respect ignore_state_request in all cases on set_automation_state(). Fixes #3416.
git-svn-id: svn://localhost/ardour2/branches/3.0@7704 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 0eaa1aefc8..4a4045f823 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -255,23 +255,25 @@ AutomationTimeAxisView::auto_clicked () void AutomationTimeAxisView::set_automation_state (AutoState state) { - if (!ignore_state_request) { - if (_automatable) { - _automatable->set_parameter_automation_state (_control->parameter(), state); - } -#if 0 - if (_route == _automatable) { // This is a time axis for route (not region) automation - _route->set_parameter_automation_state (_control->parameter(), state); - } - - if (_control->list()) - _control->alist()->set_automation_state(state); -#endif + if (ignore_state_request) { + return; } + if (_automatable) { + _automatable->set_parameter_automation_state (_control->parameter(), state); + } +#if 0 + if (_route == _automatable) { // This is a time axis for route (not region) automation + _route->set_parameter_automation_state (_control->parameter(), state); + } + + if (_control->list()) { + _control->alist()->set_automation_state(state); + } +#endif if (_view) { _view->set_automation_state (state); - + /* AutomationStreamViews don't signal when their automation state changes, so handle our updates `manually'. */ |