From b279b5e2802c1a938b0ab2e07f8f4734387e0c69 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Fri, 18 Nov 2011 12:30:42 +1000 Subject: [PATCH] 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 --- src/multimedia/effects/qsamplecache_p.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/multimedia/effects/qsamplecache_p.cpp b/src/multimedia/effects/qsamplecache_p.cpp index 69c8d66c..1a06cd17 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; }