Fix %1 hotcue lable in WOverview, fixes Bug #1618933

3 files changed, 7 insertions, 5 deletions

diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index b27026b96b..220b5b2e47 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -17,7 +17,7 @@ WaveformMark::WaveformMark(const QString& group,
             m_iHotCue = item.mid(7, item.count() - 16).toInt() - 1;
         }
     }
-    m_properties = WaveformMarkProperties(node, context, signalColors);
+    m_properties = WaveformMarkProperties(node, context, signalColors, m_iHotCue);
 }
 
 WaveformMark::WaveformMark(const QString& group,
@@ -30,7 +30,7 @@ WaveformMark::WaveformMark(const QString& group,
         QString item = "hotcue_" + QString::number(hotCue + 1) + "_position";
         m_pPointCos = std::make_unique<ControlProxy>(group, item);
     }
-    m_properties = WaveformMarkProperties(node, context, signalColors);
+    m_properties = WaveformMarkProperties(node, context, signalColors, hotCue);
 }
 
 
diff --git a/src/waveform/renderers/waveformmarkproperties.cpp b/src/waveform/renderers/waveformmarkproperties.cpp
index a843a8b2a9..314934ab0b 100644
--- a/src/waveform/renderers/waveformmarkproperties.cpp
+++ b/src/waveform/renderers/waveformmarkproperties.cpp
@@ -43,7 +43,8 @@ Qt::Alignment decodeAlignmentFlags(QString alignString, Qt::Alignment defaultFla
 
 WaveformMarkProperties::WaveformMarkProperties(const QDomNode& node,
                                                const SkinContext& context,
-                                               const WaveformSignalColors& signalColors) {
+                                               const WaveformSignalColors& signalColors,
+                                               int hotCue) {
     m_color = context.selectString(node, "Color");
     if (!m_color.isValid()) {
         // As a fallback, grab the color from the parent's AxesColor
@@ -63,7 +64,7 @@ WaveformMarkProperties::WaveformMarkProperties(const QDomNode& node,
     QString markAlign = context.selectString(node, "Align");
     m_align = decodeAlignmentFlags(markAlign, Qt::AlignBottom | Qt::AlignHCenter);
 
-    m_text = context.selectString(node, "Text");
+    m_text = context.selectString(node, "Text").arg(hotCue + 1);
     m_pixmapPath = context.selectString(node, "Pixmap");
     if (!m_pixmapPath.isEmpty()) {
         m_pixmapPath = context.getSkinPath(m_pixmapPath);
diff --git a/src/waveform/renderers/waveformmarkproperties.h b/src/waveform/renderers/waveformmarkproperties.h
index 7cdcb946a7..1215b36e28 100644
--- a/src/waveform/renderers/waveformmarkproperties.h
+++ b/src/waveform/renderers/waveformmarkproperties.h
@@ -12,7 +12,8 @@ class WaveformMarkProperties final {
     WaveformMarkProperties() = default;
     WaveformMarkProperties(const QDomNode& node,
                            const SkinContext& context,
-                           const WaveformSignalColors& signalColors);
+                           const WaveformSignalColors& signalColors,
+                           int hotCue);
 
     QColor m_color;
     QColor m_textColor;