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-07-24 07:39:34 +0000
commit448c992972d4078af1eee7ad9ccc8d86c0f2e78d (patch)
treef77fe2c630a7cc85f77b24ac5aa20feb743849a1
parent4e080dcbfc8b519b041f125c53ad5f7313ac5393 (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>
-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 43f948cef..c956d764b 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();
}
}