controllers/controllerengine: Disable DEBUG_ASSERT on invalid key

mixxxdj · Aug 30, 2020 · fd5c640 · fd5c640
1 parent 994957d
commit fd5c640
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp
@@ -1447,9 +1447,12 @@ bool ControllerEngine::isScratching(int deck) {
     Output:  -
     -------- ------------------------------------------------------ */
 void ControllerEngine::softTakeover(QString group, QString name, bool set) {
+    ConfigKey key = ConfigKey(group, name);
     ControlObject* pControl = ControlObject::getControl(
-            ConfigKey(group, name), ControlFlag::NoAssertIfMissing);
+            key, ControlFlag::AllowInvalidKey | ControlFlag::NoAssertIfMissing);
     if (!pControl) {
+        qWarning() << "Failed to" << (set ? "enable" : "disable")
+                   << "softTakeover for invalid control" << key;
         return;
     }
     if (set) {
@@ -1470,9 +1473,11 @@ void ControllerEngine::softTakeover(QString group, QString name, bool set) {
      -------- ------------------------------------------------------ */
 void ControllerEngine::softTakeoverIgnoreNextValue(
         QString group, const QString name) {
+    ConfigKey key = ConfigKey(group, name);
     ControlObject* pControl = ControlObject::getControl(
-            ConfigKey(group, name), ControlFlag::NoAssertIfMissing);
+            key, ControlFlag::AllowInvalidKey | ControlFlag::NoAssertIfMissing);
     if (!pControl) {
+        qWarning() << "Failed to call softTakeoverIgnoreNextValue for invalid control" << key;
         return;
     }