Merge pull request #13648 from acolombier/fix/overview-minute-marker-…

…div-by-zero fix: prevent div by zero and use correct config key
mixxxdj · Sep 15, 2024 · cfa0e16 · cfa0e16
2 parents 1296cdf + 0693553
commit cfa0e16
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/preferences/dialog/dlgprefwaveform.cpp b/src/preferences/dialog/dlgprefwaveform.cpp
@@ -73,7 +73,7 @@ DlgPrefWaveform::DlgPrefWaveform(
 
     m_pOverviewMinuteMarkersControl = std::make_unique<ControlObject>(
             ConfigKey(QStringLiteral("[Waveform]"),
-                    QStringLiteral("DrawOverviewMinuteMarkers")));
+                    QStringLiteral("draw_overview_minute_markers")));
     m_pOverviewMinuteMarkersControl->setReadOnly();
 
     // Populate untilMark options
@@ -304,7 +304,7 @@ void DlgPrefWaveform::slotUpdate() {
     }
 
     bool drawOverviewMinuteMarkers = m_pConfig->getValue(
-            ConfigKey("[Waveform]", "DrawOverviewMinuteMarkers"), true);
+            ConfigKey("[Waveform]", "draw_overview_minute_markers"), true);
     overviewMinuteMarkersCheckBox->setChecked(drawOverviewMinuteMarkers);
     m_pOverviewMinuteMarkersControl->forceSet(drawOverviewMinuteMarkers);
 
@@ -575,7 +575,7 @@ void DlgPrefWaveform::slotSetNormalizeOverview(bool normalize) {
 }
 
 void DlgPrefWaveform::slotSetOverviewMinuteMarkers(bool draw) {
-    m_pConfig->setValue(ConfigKey("[Waveform]", "DrawOverviewMinuteMarkers"), draw);
+    m_pConfig->setValue(ConfigKey("[Waveform]", "draw_overview_minute_markers"), draw);
     m_pOverviewMinuteMarkersControl->forceSet(draw);
 }
 

diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
@@ -88,7 +88,7 @@ WOverview::WOverview(
 
     m_pMinuteMarkersControl = make_parented<ControlProxy>(
             QStringLiteral("[Waveform]"),
-            QStringLiteral("DrawOverviewMinuteMarkers"),
+            QStringLiteral("draw_overview_minute_markers"),
             this);
     m_pMinuteMarkersControl->connectValueChanged(this, &WOverview::slotMinuteMarkersChanged);
     slotMinuteMarkersChanged(static_cast<bool>(m_pMinuteMarkersControl->get()));
@@ -741,6 +741,10 @@ void WOverview::drawMinuteMarkers(QPainter* pPainter) {
         return;
     }
 
+    if (m_pRateRatioControl->get() == 0) {
+        return;
+    }
+
     // Faster than track->getDuration() and already has playback speed ratio compensated for
     const double trackSeconds = samplePositionToSeconds(getTrackSamples());
 
@@ -1615,9 +1619,14 @@ void WOverview::paintText(const QString& text, QPainter* pPainter) {
 }
 
 double WOverview::samplePositionToSeconds(double sample) {
+    double rate = m_pRateRatioControl->get();
+    VERIFY_OR_DEBUG_ASSERT(rate != 0.0) {
+        return 1;
+    }
+
     double trackTime = sample /
             (m_trackSampleRateControl.get() * mixxx::kEngineChannelOutputCount);
-    return trackTime / m_pRateRatioControl->get();
+    return trackTime / rate;
 }
 
 void WOverview::resizeEvent(QResizeEvent* pEvent) {