summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2015-12-22 17:36:15 -0500
committerRJ Ryan <rryan@mixxx.org>2015-12-22 17:36:15 -0500
commit32a265bb89662db88bf66983b4b5337c760ec9a4 (patch)
treedd793c652d959b328e8ba70f666bc90e91711daa /src
parent745a2d643b1c1fee4d08ffbeceb4b14febd4f65b (diff)
Skip empty function prefixes.
Diffstat (limited to 'src')
-rw-r--r--src/controllers/controllerengine.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp
index 200fe5dafd..e6e18fac54 100644
--- a/src/controllers/controllerengine.cpp
+++ b/src/controllers/controllerengine.cpp
@@ -266,7 +266,10 @@ void ControllerEngine::initializeScripts(const QList<ControllerPreset::ScriptFil
m_scriptFunctionPrefixes.clear();
foreach (const ControllerPreset::ScriptFileInfo& script, scripts) {
- m_scriptFunctionPrefixes.append(script.functionPrefix);
+ // Skip empty prefixes.
+ if (!script.functionPrefix.isEmpty()) {
+ m_scriptFunctionPrefixes.append(script.functionPrefix);
+ }
}
QScriptValueList args;
@@ -1434,7 +1437,7 @@ void ControllerEngine::softTakeover(QString group, QString name, bool set) {
Purpose: Ignores the next value for the given ControlObject
This should be called before or after an absolute physical
control (slider or knob with hard limits) is changed to operate
- on a different ControlObject, allowing it to sync up to the
+ on a different ControlObject, allowing it to sync up to the
soft-takeover state without an abrupt jump.
Input: ControlObject group and key values
Output: -
@@ -1444,7 +1447,7 @@ void ControllerEngine::softTakeoverIgnoreNextValue(QString group, QString name)
if (!pControl) {
return;
}
-
+
m_st.ignoreNext(pControl);
}