summaryrefslogtreecommitdiff
path: root/libs/ardour/automation_control.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-04-13 17:42:07 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-05-31 15:30:40 -0400
commit7d493b091ae2741db39a65cc62e9d17ef57d7606 (patch)
tree722ec0006d00662a01d7ce389d9c6cd3ec8dc1fe /libs/ardour/automation_control.cc
parent4a30e1f4c81b63308eb2377a2723a98334fdb74e (diff)
do not route AutomationControl changes to an RT thread if we are loading a session
Diffstat (limited to 'libs/ardour/automation_control.cc')
-rw-r--r--libs/ardour/automation_control.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc
index 99e2f54165..97765a7070 100644
--- a/libs/ardour/automation_control.cc
+++ b/libs/ardour/automation_control.cc
@@ -280,7 +280,7 @@ AutomationControl::set_group (boost::shared_ptr<ControlGroup> cg)
bool
AutomationControl::check_rt (double val, Controllable::GroupControlDisposition gcd)
{
- if ((flags() & Controllable::RealTime) && !AudioEngine::instance()->in_process_thread()) {
+ if (!_session.loading() && (flags() & Controllable::RealTime) && !AudioEngine::instance()->in_process_thread()) {
/* queue change in RT context */
std::cerr << "::set_value (" << val << ", " << enum_2_string (gcd) << ") called for " << enum_2_string ((AutomationType) _parameter.type()) << ", queueing in RT context\n";
_session.set_control (shared_from_this(), val, gcd);