Fix crash when hiding waveforms in Deere #14170
Conversation
| @@ -335,7 +335,7 @@ class MarkerGeometry { | |||
| }; | |||
|
|
|||
| QImage WaveformMark::generateImage(float devicePixelRatio) { | |||
| assert(needsImageUpdate()); | |||
| DEBUG_ASSERT(needsImageUpdate()); | |||
There was a problem hiding this comment.
VERIFY_OR_DEBUG_ASSERT ?
IIUC all below would be a no-op otherwise, right?
There was a problem hiding this comment.
Yes, but we assert that it never happens and when it happens, it does no harm.
| const float imgheight = m_waveformRenderer->getBreadth(); | ||
| const float imgwidth = 11.f; |
There was a problem hiding this comment.
| const float imgheight = m_waveformRenderer->getBreadth(); | |
| const float imgwidth = 11.f; | |
| const float imgHeight = m_waveformRenderer->getBreadth(); | |
| const float imgWidth = 11.f; |
and where used, of course.
| if (image.isNull()) { | ||
| return; | ||
| } |
There was a problem hiding this comment.
imgWidth is < 0 and there is already a check for imgHeight != 0 above, so this can only be NULL if devicePixelRatio is 0.
Can this ever happen?
There was a problem hiding this comment.
When looking at the Qt source, there are other reasons like out of memory or such. All can't probably not happen but this saves Mixxx from crash if it happen anyway. I think a
VERIFY_OR_DEBUG_ASSERT is a good choice.
|
|
||
| // Create the image | ||
| QImage image{markerGeometry.getImageSize(devicePixelRatio), | ||
| QImage::Format_ARGB32_Premultiplied}; | ||
| if (image.isNull()) { | ||
| return image; | ||
| } |
There was a problem hiding this comment.
how can that happen?
There is already the m_breadth == 0.0f above.
|
FWIW since this happens only with Deere (which is the only skin that uses waveform Singletons), I assume this is an issue with WSplitter/QSplitter and Singleton, like when the waveform part of the splitter is collapsed the waveform is not hidden or something? |
Yes, the widget is sized to 1 before it is hidden due to the border the images have 0 height, which has caused the crash. |
|
Done |
|
Ah, now I could reproduce the crash: you need to have one or more hotcue markers visible in waveform. Can confirm the fix 👍 |
ronso0
changed the title
This fixes #14157