From 4e2a4faff170d8a0e640464203cf0e7a5ce31056 Mon Sep 17 00:00:00 2001 From: be_ Date: Mon, 5 Dec 2016 18:13:07 -0600 Subject: [PATCH] make engine.setParameter() JS soft takeover work --- src/controllers/controllerengine.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp index db140b636174..9d4cb8c28adf 100644 --- a/src/controllers/controllerengine.cpp +++ b/src/controllers/controllerengine.cpp @@ -607,9 +607,11 @@ void ControllerEngine::setParameter(QString group, QString name, double newParam ControlObjectScript* coScript = getControlObjectScript(group, name); - // TODO(XXX): support soft takeover. if (coScript != nullptr) { - coScript->setParameter(newParameter); + ControlObject* pControl = ControlObject::getControl(coScript->getKey()); + if (pControl && !m_st.ignore(pControl, newParameter)) { + coScript->setParameter(newParameter); + } } }