diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-11-18 12:30:42 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-18 05:54:06 +0100 |
| commit | b279b5e2802c1a938b0ab2e07f8f4734387e0c69 (patch) | |
| tree | 6f2e63b5b0bf93b5f3f9f2b0abcfdfb9789f3d9c /src/multimedia | |
| parent | fead7d706c1d3e9b57af20d589baa67ce3416ef4 (diff) | |
If the sample hasn't been loaded, don't try and delete things.
Causes entirely reasonable warnings from QCoreApplication::postEvents,
when calling deleteLater on a null pointer.
Change-Id: I5f1fa526b2d57844b9c0d2e634d434e2f7867bdf
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/effects/qsamplecache_p.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/multimedia/effects/qsamplecache_p.cpp b/src/multimedia/effects/qsamplecache_p.cpp index 69c8d66ca..1a06cd17e 100644 --- a/src/multimedia/effects/qsamplecache_p.cpp +++ b/src/multimedia/effects/qsamplecache_p.cpp @@ -282,8 +282,11 @@ void QSample::release() // must be called locked. void QSample::cleanup() { - m_waveDecoder->deleteLater(); - m_stream->deleteLater(); + if (m_waveDecoder) + m_waveDecoder->deleteLater(); + if (m_stream) + m_stream->deleteLater(); + m_waveDecoder = 0; m_stream = 0; } |