summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Hallot <pierre.hallot@sensefly.com>2018-03-08 14:34:22 +0100
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2018-08-17 13:39:59 +0000
commit896496d996cae7a29e135906c6d28d66b18f486f (patch)
tree57d856c3ac932a770a6fd84f7208e8df6b6039ad
parentc23ebc2b7167c875f8912c22c9df7c0db6a99a79 (diff)
Fix warning on deleteLater on nullptr in QSampleCache
It is possible to have a loading thread running, but with no network manager. In that case, calling deleteLater() on m_networkAccessManager results in a warning: postEvent: Unexpected null receiver. Fix this issue by checking whether the network manager exists before calling deleteLater() on it. Task-number: QTBUG-66910 Change-Id: I818a87a605b4e906dee47c6c815a6b8112b16829 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit 448c992972d4078af1eee7ad9ccc8d86c0f2e78d) Reviewed-by: Pierre Hallot <pierre.hallot@sensefly.com> Reviewed-by: Christian Stromme <christian.stromme@qt.io>
-rw-r--r--src/multimedia/audio/qsamplecache_p.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp
index c76f51899..6e597c072 100644
--- a/src/multimedia/audio/qsamplecache_p.cpp
+++ b/src/multimedia/audio/qsamplecache_p.cpp
@@ -141,8 +141,10 @@ void QSampleCache::loadingRelease()
m_loadingRefCount--;
if (m_loadingRefCount == 0) {
if (m_loadingThread.isRunning()) {
- m_networkAccessManager->deleteLater();
- m_networkAccessManager = nullptr;
+ if (m_networkAccessManager) {
+ m_networkAccessManager->deleteLater();
+ m_networkAccessManager = nullptr;
+ }
m_loadingThread.exit();
}
}