Merge pull request #4236 from daschuer/assert_debug

ControlDoublePrivate: log warning before assert fails.
mixxxdj · Aug 21, 2021 · c9df5af · c9df5af
2 parents 7bb2f29 + e124d1a
commit c9df5af
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/control/control.cpp b/src/control/control.cpp
@@ -148,11 +148,12 @@ QSharedPointer<ControlDoublePrivate> ControlDoublePrivate::getControl(
             auto pControl = it.value().lock();
             if (pControl) {
                 // Control object already exists
-                VERIFY_OR_DEBUG_ASSERT(!pCreatorCO) {
+                if (pCreatorCO) {
                     qWarning()
                             << "ControlObject"
                             << key.group << key.item
                             << "already created";
+                    DEBUG_ASSERT(!"pCreatorCO != nullptr, ControlObject already created");
                     return nullptr;
                 }
                 return pControl;
@@ -311,26 +312,29 @@ double ControlDoublePrivate::getParameterForValue(double value) const {
 
 double ControlDoublePrivate::getParameterForMidi(double midiParam) const {
     QSharedPointer<ControlNumericBehavior> pBehavior = m_pBehavior;
-    VERIFY_OR_DEBUG_ASSERT(pBehavior) {
-        qWarning() << "Cannot set" << m_key << "by Midi";
+    if (!pBehavior) {
+        qWarning() << "Cannot get" << m_key << "for Midi";
+        DEBUG_ASSERT(!"pBehavior == nullptr, getParameterForMidi is returning 0");
         return 0;
     }
     return pBehavior->midiToParameter(midiParam);
 }
 
 void ControlDoublePrivate::setValueFromMidi(MidiOpCode opcode, double midiParam) {
     QSharedPointer<ControlNumericBehavior> pBehavior = m_pBehavior;
-    VERIFY_OR_DEBUG_ASSERT(pBehavior) {
-        qWarning() << "Cannot set" << m_key << "by Midi";
+    if (!pBehavior) {
+        qWarning() << "Cannot set" << m_key << "from Midi";
+        DEBUG_ASSERT(!"pBehavior == nullptr, abort setValueFromMidi()");
         return;
     }
     pBehavior->setValueFromMidi(opcode, midiParam, this);
 }
 
 double ControlDoublePrivate::getMidiParameter() const {
     QSharedPointer<ControlNumericBehavior> pBehavior = m_pBehavior;
-    VERIFY_OR_DEBUG_ASSERT(pBehavior) {
-        qWarning() << "Cannot get" << m_key << "by Midi";
+    if (!pBehavior) {
+        qWarning() << "Cannot get" << m_key << "as Midi";
+        DEBUG_ASSERT(!"pBehavior == nullptr, getMidiParameter() is returning 0");
         return 0;
     }
     return pBehavior->valueToMidiParameter(get());