Merge pull request #13009 from acolombier/fix/qml-waveform-crash

fix(QML): handle case where Waveform data is missing
mixxxdj · Mar 27, 2024 · 0c34f90 · 0c34f90
2 parents b2bec36 + d7d0d60
commit 0c34f90
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/qml/qmlplayerproxy.cpp b/src/qml/qmlplayerproxy.cpp
@@ -188,16 +188,19 @@ void QmlPlayerProxy::slotWaveformChanged() {
     emit waveformTextureStrideChanged();
 
     const TrackPointer pTrack = m_pCurrentTrack;
-    if (pTrack) {
-        const ConstWaveformPointer pWaveform = pTrack->getWaveform();
-        const int textureWidth = pWaveform->getTextureStride();
-        const int textureHeight = pWaveform->getTextureSize() / pWaveform->getTextureStride();
-        if (pWaveform) {
-            const uchar* data = reinterpret_cast<const uchar*>(pWaveform->data());
-            m_waveformTexture = QImage(data, textureWidth, textureHeight, QImage::Format_RGBA8888);
-            emit waveformTextureChanged();
-        }
+    if (!pTrack) {
+        return;
+    }
+    const ConstWaveformPointer pWaveform =
+            pTrack->getWaveform();
+    if (!pWaveform) {
+        return;
     }
+    const int textureWidth = pWaveform->getTextureStride();
+    const int textureHeight = pWaveform->getTextureSize() / pWaveform->getTextureStride();
+    const uchar* data = reinterpret_cast<const uchar*>(pWaveform->data());
+    m_waveformTexture = QImage(data, textureWidth, textureHeight, QImage::Format_RGBA8888);
+    emit waveformTextureChanged();
 }
 
 void QmlPlayerProxy::slotBeatsChanged() {