diff options
| author | Be <be@mixxx.org> | 2019-09-02 07:22:45 -0500 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2019-09-02 07:25:26 -0500 |
| commit | cbb7bffa716ab68ffe3f344a92dcafb71dd6e343 (patch) | |
| tree | 54919f55982049ce10e69d8e1a7db87041fffbb0 /src/waveform/renderers | |
| parent | ef726090a31235615ab8d0351e7dc1722bf4ff41 (diff) | |
Revert "WaveformMarkRender: remove unnecessary check for null text"
This reverts commit 641250db22c12c0055648c0d8c003733b37fe9ef.
This commit introduced a regression where hotcues without labels
or colors were not drawn on the scrolling waveform.
Diffstat (limited to 'src/waveform/renderers')
| -rw-r--r-- | src/waveform/renderers/waveformrendermark.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp index df5cb87b64..5f239b4229 100644 --- a/src/waveform/renderers/waveformrendermark.cpp +++ b/src/waveform/renderers/waveformrendermark.cpp @@ -129,8 +129,8 @@ void WaveformRenderMark::slotCuesUpdated() { QString newLabel = pCue->getLabel(); QColor newColor = m_predefinedColorsRepresentation.representationFor(pCue->getColor()); - if (newLabel != pMark->m_text || newColor != pMark->fillColor() - || !pMark->fillColor().isValid()) { + if (pMark->m_text.isNull() || newLabel != pMark->m_text || + !pMark->fillColor().isValid() || newColor != pMark->fillColor()) { pMark->m_text = newLabel; pMark->setBaseColor(newColor); generateMarkImage(pMark); |