Remove rawBpm.canConvert<mixxx::Bpm> check

danferns · Aug 27, 2024 · ba1080e · ba1080e
1 parent ff86da3
commit ba1080e
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
@@ -755,16 +755,13 @@ QVariant BaseTrackTableModel::roleValue(
             if (rawBpm.isNull()) {
                 return QVariant();
             }
-            if (rawBpm.canConvert<mixxx::Bpm>()) {
-                bpm = rawBpm.value<mixxx::Bpm>();
-            } else {
-                bool ok;
-                const auto bpmValue = rawBpm.toDouble(&ok);
-                VERIFY_OR_DEBUG_ASSERT(ok) {
-                    return QVariant();
-                }
-                bpm = mixxx::Bpm(bpmValue);
+
+            // reuse ok variable from key
+            const auto bpmValue = rawBpm.toDouble(&ok);
+            VERIFY_OR_DEBUG_ASSERT(ok) {
+                return QVariant();
             }
+            bpm = mixxx::Bpm(bpmValue);
 
             const auto targetKey = KeyUtils::tonicToKey(0, true);
             const auto targetBpm = mixxx::Bpm(100);